diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 00:53:51 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 00:53:51 +0000 |
| commit | dce41bea4ed28c09584539dbe4e97470bb0d5698 (patch) | |
| tree | b10f0adb166846c1fe2660f1ace6cacf65946539 /gpu | |
| parent | 33e149116edded96cad6a80bf79a1ef1890c81ce (diff) | |
| download | chromium_src-dce41bea4ed28c09584539dbe4e97470bb0d5698.zip chromium_src-dce41bea4ed28c09584539dbe4e97470bb0d5698.tar.gz chromium_src-dce41bea4ed28c09584539dbe4e97470bb0d5698.tar.bz2 | |
Fix glGetTexParameter so it works for TEXTURE_CUBE_MAP
TEST=passes new webgl conformance test
BUG=136538
Review URL: https://chromiumcodereview.appspot.com/10735038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
3 files changed, 3 insertions, 18 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index af6d353..a6a10d0 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -213,12 +213,7 @@ _ENUM_LISTS = { 'type': 'GLenum', 'valid': [ 'GL_TEXTURE_2D', - 'GL_TEXTURE_CUBE_MAP_POSITIVE_X', - 'GL_TEXTURE_CUBE_MAP_NEGATIVE_X', - 'GL_TEXTURE_CUBE_MAP_POSITIVE_Y', - 'GL_TEXTURE_CUBE_MAP_NEGATIVE_Y', - 'GL_TEXTURE_CUBE_MAP_POSITIVE_Z', - 'GL_TEXTURE_CUBE_MAP_NEGATIVE_Z', + 'GL_TEXTURE_CUBE_MAP', ], 'invalid': [ 'GL_PROXY_TEXTURE_CUBE_MAP', 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 8f2818b..034e6c4 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h +++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h @@ -854,12 +854,7 @@ std::string GLES2Util::GetStringGetMaxIndexType(uint32 value) { std::string GLES2Util::GetStringGetTexParamTarget(uint32 value) { static EnumToString string_table[] = { { GL_TEXTURE_2D, "GL_TEXTURE_2D" }, - { GL_TEXTURE_CUBE_MAP_POSITIVE_X, "GL_TEXTURE_CUBE_MAP_POSITIVE_X" }, - { GL_TEXTURE_CUBE_MAP_NEGATIVE_X, "GL_TEXTURE_CUBE_MAP_NEGATIVE_X" }, - { GL_TEXTURE_CUBE_MAP_POSITIVE_Y, "GL_TEXTURE_CUBE_MAP_POSITIVE_Y" }, - { GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" }, - { GL_TEXTURE_CUBE_MAP_POSITIVE_Z, "GL_TEXTURE_CUBE_MAP_POSITIVE_Z" }, - { GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" }, + { GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP" }, }; return GLES2Util::GetQualifiedEnumString( string_table, arraysize(string_table), value); 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 79f4e57..ad51477 100644 --- a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h @@ -216,12 +216,7 @@ static GLenum valid_get_max_index_type_table[] = { static GLenum valid_get_tex_param_target_table[] = { GL_TEXTURE_2D, - GL_TEXTURE_CUBE_MAP_POSITIVE_X, - GL_TEXTURE_CUBE_MAP_NEGATIVE_X, - GL_TEXTURE_CUBE_MAP_POSITIVE_Y, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, - GL_TEXTURE_CUBE_MAP_POSITIVE_Z, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, + GL_TEXTURE_CUBE_MAP, }; static GLenum valid_hint_mode_table[] = { |