diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 22:31:28 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 22:31:28 +0000 |
| commit | f12d182260d12b818cf6775cfc81b4a71879011d (patch) | |
| tree | 75558e67bb2b277425e453796f1de48acbd6773a /gpu | |
| parent | 31f19e366c6bf6e28c181c2d4672d3ff31fbd12e (diff) | |
| download | chromium_src-f12d182260d12b818cf6775cfc81b4a71879011d.zip chromium_src-f12d182260d12b818cf6775cfc81b4a71879011d.tar.gz chromium_src-f12d182260d12b818cf6775cfc81b4a71879011d.tar.bz2 | |
Fix Auto-genearated GL state
BUG=155557,158607
TBR=apatrick@chromium.org
Review URL: https://codereview.chromium.org/11339057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
4 files changed, 7 insertions, 5 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index 450dea4..8a56eb8 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -229,7 +229,7 @@ _STATES = { 'name': 'sample_coverage_value', 'type': 'GLclampf', 'enum': 'GL_SAMPLE_COVERAGE_VALUE', - 'default': '0.0f', + 'default': '1.0f', }, { 'name': 'sample_coverage_invert', @@ -2846,8 +2846,8 @@ class StateSetHandler(TypeHandler): state = _STATES[state_name] states = state['states'] args = func.GetOriginalArgs() - for ndx,state in enumerate(states): - file.Write(" state_.%s = %s;\n" % (state['name'], args[ndx].name)) + for ndx,item in enumerate(states): + file.Write(" state_.%s = %s;\n" % (item['name'], args[ndx].name)) if 'state_flag' in state: file.Write(" %s = true;\n" % state['state_flag']) if not func.GetInfo("no_gl"): diff --git a/gpu/command_buffer/service/context_state_impl_autogen.h b/gpu/command_buffer/service/context_state_impl_autogen.h index 0c207c7..a930259 100644 --- a/gpu/command_buffer/service/context_state_impl_autogen.h +++ b/gpu/command_buffer/service/context_state_impl_autogen.h @@ -52,7 +52,7 @@ void ContextState::Initialize() { line_width = 1.0f; polygon_offset_factor = 0.0f; polygon_offset_units = 0.0f; - sample_coverage_value = 0.0f; + sample_coverage_value = 1.0f; sample_coverage_invert = false; scissor_x = 0.0f; scissor_y = 0.0f; diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h index 9d406c7..9939b6c 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h @@ -271,6 +271,7 @@ error::Error GLES2DecoderImpl::HandleColorMask( state_.color_mask_green = green; state_.color_mask_blue = blue; state_.color_mask_alpha = alpha; + clear_state_dirty_ = true; return error::kNoError; } @@ -605,6 +606,7 @@ error::Error GLES2DecoderImpl::HandleDepthMask( uint32 immediate_data_size, const gles2::DepthMask& c) { GLboolean flag = static_cast<GLboolean>(c.flag); state_.depth_mask = flag; + clear_state_dirty_ = true; return error::kNoError; } diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h index 54eb68b..41f894b 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h @@ -65,7 +65,7 @@ void GLES2DecoderTestBase::SetupInitStateExpectations() { EXPECT_CALL(*gl_, PolygonOffset(0.0f, 0.0f)) .Times(1) .RetiresOnSaturation(); - EXPECT_CALL(*gl_, SampleCoverage(0.0f, false)) + EXPECT_CALL(*gl_, SampleCoverage(1.0f, false)) .Times(1) .RetiresOnSaturation(); EXPECT_CALL( |