Adds support for the GL_ANGLE_texture_usage and GL_EXT_texture_storage

gpu/command_buffer/build_gles2_cmd_buffer.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """code generator for GLES2 command buffers."""
 
 import os
 import os.path
 import sys
@@ skipping 183 matching lines @@
 GL_APICALL void         GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y);
 GL_APICALL void         GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values);
 GL_APICALL void         GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z);
 GL_APICALL void         GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values);
 GL_APICALL void         GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
 GL_APICALL void         GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values);
 GL_APICALL void         GL_APIENTRY glVertexAttribPointer (GLuint indx, GLintVertexAttribSize size, GLenumVertexAttribType type, GLboolean normalized, GLsizei stride, const void* ptr);
 GL_APICALL void         GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
 GL_APICALL void         GL_APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenumBlitFilter filter);
 GL_APICALL void         GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenumRenderBufferTarget target, GLsizei samples, GLenumRenderBufferFormat internalformat, GLsizei width, GLsizei height);
+GL_APICALL void         GL_APIENTRY glTexStorage2DEXT (GLenumTextureTarget target, GLsizei levels, GLintTextureInternalFormatStorage internalFormat, GLsizei width, GLsizei height);
 // Non-GL commands.
 GL_APICALL void         GL_APIENTRY glSwapBuffers (void);
 GL_APICALL GLuint       GL_APIENTRY glGetMaxValueInBufferCHROMIUM (GLidBuffer buffer_id, GLsizei count, GLenumGetMaxIndexType type, GLuint offset);
 GL_APICALL void         GL_APIENTRY glGenSharedIdsCHROMIUM (GLuint namespace_id, GLuint id_offset, GLsizeiNotNegative n, GLuint* ids);
 GL_APICALL void         GL_APIENTRY glDeleteSharedIdsCHROMIUM (GLuint namespace_id, GLsizeiNotNegative n, const GLuint* ids);
 GL_APICALL void         GL_APIENTRY glRegisterSharedIdsCHROMIUM (GLuint namespace_id, GLsizeiNotNegative n, const GLuint* ids);
 GL_APICALL GLboolean    GL_APIENTRY glEnableFeatureCHROMIUM (const char* feature);
 GL_APICALL void*        GL_APIENTRY glMapBufferSubDataCHROMIUM (GLuint target, GLintptrNotNegative offset, GLsizeiptr size, GLenum access);
 GL_APICALL void         GL_APIENTRY glUnmapBufferSubDataCHROMIUM (const void* mem);
 GL_APICALL void*        GL_APIENTRY glMapTexSubImage2DCHROMIUM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access);
@@ skipping 215 matching lines @@
   'GetRequestableExtensionsCHROMIUM':                          449,
   'RequestExtensionCHROMIUM':                                  450,
   'CreateStreamTextureCHROMIUM':                               451,
   'DestroyStreamTextureCHROMIUM':                              452,
   'Placeholder453CHROMIUM':                                    453,
   'GetMultipleIntegervCHROMIUM':                               454,
   'GetProgramInfoCHROMIUM':                                    455,
   'GetTranslatedShaderSourceANGLE':                            456,
   'PostSubBufferCHROMIUM':                                     457,
   'TexImageIOSurface2DCHROMIUM':                               458,
+  'TexStorage2DEXT':                                           459,
 }
 
 # This is a list of enum names and their valid values. It is used to map
 # GLenum arguments to a specific set of valid values.
 _ENUM_LISTS = {
   'BlitFilter': {
     'type': 'GLenum',
     'valid': [
       'GL_NEAREST',
       'GL_LINEAR',
@@ skipping 442 matching lines @@
       'GL_LINEAR_MIPMAP_LINEAR',
     ],
   },
   'TextureMagFilterMode': {
     'type': 'GLenum',
     'valid': [
       'GL_NEAREST',
       'GL_LINEAR',
     ],
   },
+  'TextureUsage': {
+    'type': 'GLenum',
+    'valid': [
+      'GL_NONE',
+      'GL_FRAMEBUFFER_ATTACHMENT_ANGLE',
+    ],
+  },
   'VertexAttribute': {
     'type': 'GLenum',
     'valid': [
       # some enum that the decoder actually passes through to GL needs
       # to be the first listed here since it's used in unit tests.
       'GL_VERTEX_ATTRIB_ARRAY_NORMALIZED',
       'GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING',
       'GL_VERTEX_ATTRIB_ARRAY_ENABLED',
       'GL_VERTEX_ATTRIB_ARRAY_SIZE',
       'GL_VERTEX_ATTRIB_ARRAY_STRIDE',
@@ skipping 118 matching lines @@
       'GL_LUMINANCE',
       'GL_LUMINANCE_ALPHA',
       'GL_RGB',
       'GL_RGBA',
     ],
     'invalid': [
       'GL_BGRA',
       'GL_BGR',
     ],
   },
+  'TextureInternalFormatStorage': {
+    'type': 'GLenum',
+    'valid': [
+      'GL_RGB565',
+      'GL_RGBA4',
+      'GL_RGB5_A1',
+      'GL_ALPHA8_EXT',
+      'GL_LUMINANCE8_EXT',
+      'GL_LUMINANCE8_ALPHA8_EXT',
+      'GL_RGB8_OES',
+      'GL_RGBA8_OES',

[greggman, 2011/12/02 18:33:24]

these formats probably need to be added to
src/gpu/command_buffer/common/gles2_cmd_utils.cc 
in ElementsPerGroup and GetChannelsForFormat

[vangelis, 2011/12/03 00:19:53]

These enums are only valid when supplying them to glTexStorage2D. They combine
the format and type parameter into one.  The actual internalformat of the
texture allocated is still one of the traditional GL formats. For example, using
GL_RGB565 when allocating with glTexStorage2D will result in a texture with
format = GL_RGB and type = GL_UNSIGNED_SHORT_5_6_6.

It looks like ElementsPerGroup and GetChannelsForFormat only get called with
valid texture formats. 

Am I reading this wrong?

[greggman, 2011/12/03 01:41:01]

I see. Hmm, well, I guess it's fine. That seems to go against OpenGL ES 2.0 in
that there are no conversions and the formats have to be the same. I feel like
you should pass in type/format to TexStorage so you can know to use the same
type/format in TexSubImage2D but okay I guess.

+    ],
+  },
   'VertexAttribType': {
     'type': 'GLenum',
     'valid': [
       'GL_BYTE',
       'GL_UNSIGNED_BYTE',
       'GL_SHORT',
       'GL_UNSIGNED_SHORT',
     #  'GL_FIXED',  // This is not available on Desktop GL.
       'GL_FLOAT',
     ],
@@ skipping 745 matching lines @@
     'type': 'UnknownCommand',
     'extension': True,
     'chromium': True,
   },
   'TexImageIOSurface2DCHROMIUM': {
     'decoder_func': 'DoTexImageIOSurface2DCHROMIUM',
     'unit_test': False,
     'extension': True,
     'chromium': True,
   },
+  'TexStorage2DEXT': {
+    'unit_test': False,
+    'extension': True,
+    'decoder_func': 'DoTexStorage2DEXT',
+  },
+
 }
 
 
 def SplitWords(input_string):
   """Transforms a input_string into a list of lower-case components.
 
   Args:
     input_string: the input string.
 
   Returns:
@@ skipping 4176 matching lines @@
       gen.WriteDocs("docs/gles2_cmd_format_docs_autogen.h")
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
     return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))