diff options
| author | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 17:59:18 +0000 |
|---|---|---|
| committer | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 17:59:18 +0000 |
| commit | d347a62657be6feb82b62e2c584cfbe6893ad964 (patch) | |
| tree | 57ecd88aa8a86b8fba2254d1ca0704e979077c37 /gpu | |
| parent | 6e5a00a480599903632de7a80a5e3b42a5b00c02 (diff) | |
| download | chromium_src-d347a62657be6feb82b62e2c584cfbe6893ad964.zip chromium_src-d347a62657be6feb82b62e2c584cfbe6893ad964.tar.gz chromium_src-d347a62657be6feb82b62e2c584cfbe6893ad964.tar.bz2 | |
Change the enum GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE to the assigned value.
The ANGLE side change is in r785, thus, roll ANGLE from r784 to r785.
BUG=none
TEST=tree green
Review URL: http://codereview.chromium.org/8252012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/GLES2/gl2ext.h | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gl_utils.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gpu/GLES2/gl2ext.h b/gpu/GLES2/gl2ext.h index 67bd0cc..4bd49c8 100644 --- a/gpu/GLES2/gl2ext.h +++ b/gpu/GLES2/gl2ext.h @@ -1083,7 +1083,7 @@ typedef void (GL_APIENTRYP PFNGLENABLEFEATURECHROMIUM) (const GLchar *feature); #ifndef GL_ANGLE_translated_shader_source #define GL_ANGLE_translated_shader_source 1 #ifndef GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE -#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x6900 +#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 #endif #ifdef GL_GLEXT_PROTOTYPES #define glGetTranslatedShaderSourceANGLE GLES2_GET_FUN(GetTranslatedShaderSourceANGLE) 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 3a5f252..14e626f 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h +++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h @@ -283,6 +283,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = { { 0x8C0A, "GL_SGX_BINARY_IMG", }, { 0x846D, "GL_ALIASED_POINT_SIZE_RANGE", }, { 0x846E, "GL_ALIASED_LINE_WIDTH_RANGE", }, + { 0x93A0, "GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE", }, { 0x8802, "GL_STENCIL_BACK_PASS_DEPTH_FAIL", }, { 0x8C01, "GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG", }, { 0x8C00, "GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG", }, @@ -345,7 +346,6 @@ static GLES2Util::EnumToString enum_to_string_table[] = { { 0x84C4, "GL_TEXTURE4", }, { 0x85B5, "GL_VERTEX_ARRAY_BINDING_OES", }, { 0x8253, "GL_GUILTY_CONTEXT_RESET_ARB", }, - { 0x6900, "GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE", }, { 0x00200000, "GL_STENCIL_BUFFER_BIT5_QCOM", }, { 0x8D68, "GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES", }, { 0x8D61, "GL_HALF_FLOAT_OES", }, diff --git a/gpu/command_buffer/service/gl_utils.h b/gpu/command_buffer/service/gl_utils.h index 8ac4f13..0aae91d 100644 --- a/gpu/command_buffer/service/gl_utils.h +++ b/gpu/command_buffer/service/gl_utils.h @@ -40,7 +40,7 @@ #define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68 // GL_ANGLE_translated_shader_source -#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x6900 +#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 #define GL_GLEXT_PROTOTYPES 1 |