summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/build_gles2_cmd_buffer.py
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-07 23:28:11 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-07 23:28:11 +0000
commit302ce6d93bce9050a23f3d02cf7c36d2a9d9a153 (patch)
tree29a7f80e9011493ba920f57124259c77efb66f88 /gpu/command_buffer/build_gles2_cmd_buffer.py
parent53d887fe6cc732e8baf180e8d76b7d03b6425659 (diff)
downloadchromium_src-302ce6d93bce9050a23f3d02cf7c36d2a9d9a153.zip
chromium_src-302ce6d93bce9050a23f3d02cf7c36d2a9d9a153.tar.gz
chromium_src-302ce6d93bce9050a23f3d02cf7c36d2a9d9a153.tar.bz2
Correct reporting of compressed texture formats and shader binary formats
NOTE: There's an issue here that before this change the largest number of values returned by glGetXXX was 4 and now it's undefined. The issue will come up if there are ever more than 15 because the GLES2Implementation only currently handles 15. See GLES2Implementation::kMaxSizeOfSimpleResult. http://code.google.com/p/chromium/issues/detail?id=88227 TEST=unit tests BUG=none Review URL: http://codereview.chromium.org/7304002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/build_gles2_cmd_buffer.py')
-rwxr-xr-xgpu/command_buffer/build_gles2_cmd_buffer.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index a530629..479acb8 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -155,7 +155,7 @@ GL_APICALL void GL_APIENTRY glReleaseShaderCompiler (void);
GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenumRenderBufferTarget target, GLenumRenderBufferFormat internalformat, GLsizei width, GLsizei height);
GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void GL_APIENTRY glShaderBinary (GLsizeiNotNegative n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizeiNotNegative length);
+GL_APICALL void GL_APIENTRY glShaderBinary (GLsizeiNotNegative n, const GLuint* shaders, GLenumShaderBinaryFormat binaryformat, const void* binary, GLsizeiNotNegative length);
GL_APICALL void GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const char** str, const GLint* length);
GL_APICALL void GL_APIENTRY glStencilFunc (GLenumCmpFunction func, GLint ref, GLuint mask);
GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenumFaceType face, GLenumCmpFunction func, GLint ref, GLuint mask);
@@ -967,6 +967,11 @@ _ENUM_LISTS = {
'GL_STENCIL_INDEX8',
],
},
+ 'ShaderBinaryFormat': {
+ 'type': 'GLenum',
+ 'valid': [
+ ],
+ },
'StencilOp': {
'type': 'GLenum',
'valid': [