diff options
| author | kkinnunen@nvidia.com <kkinnunen@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 11:08:30 +0000 |
|---|---|---|
| committer | kkinnunen@nvidia.com <kkinnunen@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 11:08:30 +0000 |
| commit | a9504a800cded873b44a9831b3c8865127b0a458 (patch) | |
| tree | 121a5c169bba9e6e4aa9cf81461acd4f421d2a10 /gpu | |
| parent | 30640db7428baaebaafcacef416d3316972ea684 (diff) | |
| download | chromium_src-a9504a800cded873b44a9831b3c8865127b0a458.zip chromium_src-a9504a800cded873b44a9831b3c8865127b0a458.tar.gz chromium_src-a9504a800cded873b44a9831b3c8865127b0a458.tar.bz2 | |
Remove duplicate entries from GLState valid value set
The code-generator added duplicate values for GLState value validator.
BUG=373132
Review URL: https://codereview.chromium.org/282753004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
3 files changed, 8 insertions, 20 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index 94c39d6..c7ec3af 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -8213,18 +8213,22 @@ def main(argv): (options, args) = parser.parse_args(args=argv) # Add in states and capabilites to GLState + gl_state_valid = _NAMED_TYPE_INFO['GLState']['valid'] for state_name in sorted(_STATES.keys()): state = _STATES[state_name] if 'enum' in state: - _NAMED_TYPE_INFO['GLState']['valid'].append(state['enum']) + if not state['enum'] in gl_state_valid: + gl_state_valid.append(state['enum']) else: for item in state['states']: if 'extension_flag' in item: continue - _NAMED_TYPE_INFO['GLState']['valid'].append(item['enum']) + if not item['enum'] in gl_state_valid: + gl_state_valid.append(item['enum']) for capability in _CAPABILITY_FLAGS: - _NAMED_TYPE_INFO['GLState']['valid'].append("GL_%s" % - capability['name'].upper()) + valid_value = "GL_%s" % capability['name'].upper() + if not valid_value in gl_state_valid: + gl_state_valid.append(valid_value) # This script lives under gpu/command_buffer, cd to base directory. os.chdir(os.path.dirname(__file__) + "/../..") diff --git a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h index 14800ba..b3ec421 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h +++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h @@ -2603,17 +2603,10 @@ std::string GLES2Util::GetStringGLState(uint32_t value) { {GL_CULL_FACE_MODE, "GL_CULL_FACE_MODE"}, {GL_DEPTH_FUNC, "GL_DEPTH_FUNC"}, {GL_DEPTH_WRITEMASK, "GL_DEPTH_WRITEMASK"}, - {GL_DEPTH_RANGE, "GL_DEPTH_RANGE"}, {GL_FRONT_FACE, "GL_FRONT_FACE"}, - {GL_GENERATE_MIPMAP_HINT, "GL_GENERATE_MIPMAP_HINT"}, {GL_LINE_WIDTH, "GL_LINE_WIDTH"}, - {GL_PACK_ALIGNMENT, "GL_PACK_ALIGNMENT"}, - {GL_UNPACK_ALIGNMENT, "GL_UNPACK_ALIGNMENT"}, {GL_POLYGON_OFFSET_FACTOR, "GL_POLYGON_OFFSET_FACTOR"}, {GL_POLYGON_OFFSET_UNITS, "GL_POLYGON_OFFSET_UNITS"}, - {GL_SAMPLE_COVERAGE_VALUE, "GL_SAMPLE_COVERAGE_VALUE"}, - {GL_SAMPLE_COVERAGE_INVERT, "GL_SAMPLE_COVERAGE_INVERT"}, - {GL_SCISSOR_BOX, "GL_SCISSOR_BOX"}, {GL_STENCIL_FUNC, "GL_STENCIL_FUNC"}, {GL_STENCIL_REF, "GL_STENCIL_REF"}, {GL_STENCIL_VALUE_MASK, "GL_STENCIL_VALUE_MASK"}, @@ -2628,7 +2621,6 @@ std::string GLES2Util::GetStringGLState(uint32_t value) { {GL_STENCIL_BACK_FAIL, "GL_STENCIL_BACK_FAIL"}, {GL_STENCIL_BACK_PASS_DEPTH_FAIL, "GL_STENCIL_BACK_PASS_DEPTH_FAIL"}, {GL_STENCIL_BACK_PASS_DEPTH_PASS, "GL_STENCIL_BACK_PASS_DEPTH_PASS"}, - {GL_VIEWPORT, "GL_VIEWPORT"}, {GL_BLEND, "GL_BLEND"}, {GL_CULL_FACE, "GL_CULL_FACE"}, {GL_DEPTH_TEST, "GL_DEPTH_TEST"}, diff --git a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h index 5db1bc3..e344c30 100644 --- a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h @@ -149,17 +149,10 @@ static const GLenum valid_g_l_state_table[] = { GL_CULL_FACE_MODE, GL_DEPTH_FUNC, GL_DEPTH_WRITEMASK, - GL_DEPTH_RANGE, GL_FRONT_FACE, - GL_GENERATE_MIPMAP_HINT, GL_LINE_WIDTH, - GL_PACK_ALIGNMENT, - GL_UNPACK_ALIGNMENT, GL_POLYGON_OFFSET_FACTOR, GL_POLYGON_OFFSET_UNITS, - GL_SAMPLE_COVERAGE_VALUE, - GL_SAMPLE_COVERAGE_INVERT, - GL_SCISSOR_BOX, GL_STENCIL_FUNC, GL_STENCIL_REF, GL_STENCIL_VALUE_MASK, @@ -174,7 +167,6 @@ static const GLenum valid_g_l_state_table[] = { GL_STENCIL_BACK_FAIL, GL_STENCIL_BACK_PASS_DEPTH_FAIL, GL_STENCIL_BACK_PASS_DEPTH_PASS, - GL_VIEWPORT, GL_BLEND, GL_CULL_FACE, GL_DEPTH_TEST, |