Add a bunch of ES3 enums to the validator.

gpu/command_buffer/build_gles2_cmd_buffer.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 itertools
 import os
 import os.path
@@ skipping 552 matching lines @@
     ],
     'invalid': [
       'GL_LINEAR_MIPMAP_LINEAR',
     ],
   },
   'FrameBufferTarget': {
     'type': 'GLenum',
     'valid': [
       'GL_FRAMEBUFFER',
     ],
+    'valid_es3': [
+      'GL_DRAW_FRAMEBUFFER' ,
+      'GL_READ_FRAMEBUFFER' ,
+    ],
+    'invalid': [
+      'GL_RENDERBUFFER',
+    ],
+  },
+  'InvalidateFrameBufferTarget': {
+    'type': 'GLenum',
+    'valid': [
+      'GL_FRAMEBUFFER',
+    ],
     'invalid': [
       'GL_DRAW_FRAMEBUFFER' ,
       'GL_READ_FRAMEBUFFER' ,
     ],
   },
   'RenderBufferTarget': {
     'type': 'GLenum',
     'valid': [
       'GL_RENDERBUFFER',
     ],
@@ skipping 81 matching lines @@
       'GL_RENDERBUFFER',
     ],
   },
   'BufferUsage': {
     'type': 'GLenum',
     'valid': [
       'GL_STREAM_DRAW',
       'GL_STATIC_DRAW',
       'GL_DYNAMIC_DRAW',
     ],
+    'valid_es3': [
+      'GL_STREAM_READ',
+      'GL_STREAM_COPY',
+      'GL_STATIC_READ',
+      'GL_STATIC_COPY',
+      'GL_DYNAMIC_READ',
+      'GL_DYNAMIC_COPY',
+    ],
     'invalid': [
-      'GL_STATIC_READ',
+      'GL_NONE',
     ],
   },
   'CompressedTextureFormat': {
     'type': 'GLenum',
     'valid': [
     ],
     'valid_es3': [
       'GL_COMPRESSED_R11_EAC',
       'GL_COMPRESSED_SIGNED_R11_EAC',
       'GL_COMPRESSED_RG11_EAC',
@@ skipping 273 matching lines @@
       'GL_ALWAYS',
     ],
   },
   'Equation': {
     'type': 'GLenum',
     'valid': [
       'GL_FUNC_ADD',
       'GL_FUNC_SUBTRACT',
       'GL_FUNC_REVERSE_SUBTRACT',
     ],
-    'invalid': [
+    'valid_es3': [
       'GL_MIN',
       'GL_MAX',
     ],
+    'invalid': [
+      'GL_NONE',
+    ],
   },
   'SrcBlendFactor': {
     'type': 'GLenum',
     'valid': [
       'GL_ZERO',
       'GL_ONE',
       'GL_SRC_COLOR',
       'GL_ONE_MINUS_SRC_COLOR',
       'GL_DST_COLOR',
       'GL_ONE_MINUS_DST_COLOR',
@@ skipping 53 matching lines @@
       'GL_QUADS',
       'GL_POLYGON',
     ],
   },
   'IndexType': {
     'type': 'GLenum',
     'valid': [
       'GL_UNSIGNED_BYTE',
       'GL_UNSIGNED_SHORT',
     ],
+    'valid_es3': [
+      'GL_UNSIGNED_INT',
+    ],
     'invalid': [
-      'GL_UNSIGNED_INT',
       'GL_INT',
     ],
   },
   'GetMaxIndexType': {
     'type': 'GLenum',
     'valid': [
       'GL_UNSIGNED_BYTE',
       'GL_UNSIGNED_SHORT',
       'GL_UNSIGNED_INT',
     ],
     'invalid': [
       'GL_INT',
     ],
   },
   'Attachment': {
     'type': 'GLenum',
     'valid': [
       'GL_COLOR_ATTACHMENT0',
       'GL_DEPTH_ATTACHMENT',
       'GL_STENCIL_ATTACHMENT',
     ],
+    'valid_es3': [
+      'GL_DEPTH_STENCIL_ATTACHMENT',
+    ],
   },
   'BackbufferAttachment': {
     'type': 'GLenum',
     'valid': [
       'GL_COLOR_EXT',
       'GL_DEPTH_EXT',
       'GL_STENCIL_EXT',
     ],
   },
   'BufferParameter': {
     'type': 'GLenum',
     'valid': [
       'GL_BUFFER_SIZE',
       'GL_BUFFER_USAGE',
     ],
+    'valid_es3': [
+      'GL_BUFFER_ACCESS_FLAGS',

[piman, 2015/05/13 22:35:29]

note: because of the logic in GLES2DecoderImpl::HandleMapBufferRange, we have to
intercept the Get of this one to return the original value (which we may need to
track).

[Zhenyao Mo, 2015/05/13 23:02:53]

Acknowledged.

Will follow up on this: crbug.com/487834

+      'GL_BUFFER_MAPPED',
+      'GL_BUFFER_MAP_LENGTH',
+      'GL_BUFFER_MAP_OFFSET',
+    ],
     'invalid': [
       'GL_PIXEL_PACK_BUFFER',
     ],
   },
   'BufferMode': {
     'type': 'GLenum',
     'valid': [
       'GL_INTERLEAVED_ATTRIBS',
       'GL_SEPARATE_ATTRIBS',
     ],
     'invalid': [
       'GL_PIXEL_PACK_BUFFER',
     ],
   },
   'FrameBufferParameter': {
     'type': 'GLenum',
     'valid': [
       'GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE',
       'GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME',
       'GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL',
       'GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE',
     ],
+    'valid_es3': [
+      'GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE',
+      'GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE',
+      'GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE',
+      'GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE',
+      'GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE',
+      'GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE',
+      'GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE',
+      'GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING',
+      'GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER',
+    ],
   },
   'MatrixMode': {
     'type': 'GLenum',
     'valid': [
       'GL_PATH_PROJECTION_CHROMIUM',
       'GL_PATH_MODELVIEW_CHROMIUM',
     ],
   },
   'ProgramParameter': {
     'type': 'GLenum',
     'valid': [
       'GL_DELETE_STATUS',
       'GL_LINK_STATUS',
       'GL_VALIDATE_STATUS',
       'GL_INFO_LOG_LENGTH',
       'GL_ATTACHED_SHADERS',
       'GL_ACTIVE_ATTRIBUTES',
       'GL_ACTIVE_ATTRIBUTE_MAX_LENGTH',
       'GL_ACTIVE_UNIFORMS',
       'GL_ACTIVE_UNIFORM_MAX_LENGTH',
     ],
+    'valid_es3': [
+      'GL_ACTIVE_UNIFORM_BLOCKS',
+      'GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH',
+      'GL_TRANSFORM_FEEDBACK_BUFFER_MODE',
+      'GL_TRANSFORM_FEEDBACK_VARYINGS',
+      'GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH',
+      # 'GL_PROGRAM_BINARY_RETRIEVABLE_HINT',

[bajones, 2015/05/13 22:38:40]

Probably don't want to leave this as a comment. If it's valid in ES3 (not
WebGL2) why not add it? If we're not supporting it, maybe add it explicitly to
the invalid list?

[Zhenyao Mo, 2015/05/13 23:02:53]

Done.

+    ],
   },
   'QueryObjectParameter': {
     'type': 'GLenum',
     'valid': [
       'GL_QUERY_RESULT_EXT',
       'GL_QUERY_RESULT_AVAILABLE_EXT',
     ],
   },
   'QueryParameter': {
     'type': 'GLenum',
@@ skipping 19 matching lines @@
       'GL_RENDERBUFFER_RED_SIZE',
       'GL_RENDERBUFFER_GREEN_SIZE',
       'GL_RENDERBUFFER_BLUE_SIZE',
       'GL_RENDERBUFFER_ALPHA_SIZE',
       'GL_RENDERBUFFER_DEPTH_SIZE',
       'GL_RENDERBUFFER_STENCIL_SIZE',
       'GL_RENDERBUFFER_WIDTH',
       'GL_RENDERBUFFER_HEIGHT',
       'GL_RENDERBUFFER_INTERNAL_FORMAT',
     ],
+    'valid_es3': [
+      'GL_RENDERBUFFER_SAMPLES',
+    ],
+  },
+  'InternalFormatParameter': {
+    'type': 'GLenum',
+    'valid': [
+      'GL_NUM_SAMPLE_COUNTS',
+      'GL_SAMPLES',
+    ],
   },
   'SamplerParameter': {
     'type': 'GLenum',
     'valid': [
       'GL_TEXTURE_MAG_FILTER',
       'GL_TEXTURE_MIN_FILTER',
       'GL_TEXTURE_MIN_LOD',
       'GL_TEXTURE_MAX_LOD',
       'GL_TEXTURE_WRAP_S',
       'GL_TEXTURE_WRAP_T',
@@ skipping 127 matching lines @@
       # 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',
       'GL_VERTEX_ATTRIB_ARRAY_TYPE',
       'GL_CURRENT_VERTEX_ATTRIB',
     ],
+    'valid_es3': [
+      'GL_VERTEX_ATTRIB_ARRAY_INTEGER',
+      'GL_VERTEX_ATTRIB_ARRAY_DIVISOR',
+    ],
   },
   'VertexPointer': {
     'type': 'GLenum',
     'valid': [
       'GL_VERTEX_ATTRIB_ARRAY_POINTER',
     ],
   },
   'HintTarget': {
     'type': 'GLenum',
     'valid': [
       'GL_GENERATE_MIPMAP_HINT',
     ],
+    'valid_es3': [
+      'GL_FRAGMENT_SHADER_DERIVATIVE_HINT',
+    ],
     'invalid': [
       'GL_PERSPECTIVE_CORRECTION_HINT',
     ],
   },
   'HintMode': {
     'type': 'GLenum',
     'valid': [
       'GL_FASTEST',
       'GL_NICEST',
       'GL_DONT_CARE',
     ],
   },
   'PixelStore': {
     'type': 'GLenum',
     'valid': [
       'GL_PACK_ALIGNMENT',
       'GL_UNPACK_ALIGNMENT',
       'GL_UNPACK_FLIP_Y_CHROMIUM',
       'GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM',
       'GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM',
     ],
+    'valid_es3': [
+      'GL_PACK_ROW_LENGTH',
+      'GL_PACK_IMAGE_HEIGHT',

[bajones, 2015/05/13 22:38:40]

As per conversation with Ken, this isn't in the ES3 spec any more.

[Zhenyao Mo, 2015/05/13 23:02:53]

Done.

+      'GL_PACK_SKIP_PIXELS',
+      'GL_PACK_SKIP_ROWS',
+      'GL_PACK_SKIP_IMAGES',
+      'GL_UNPACK_ROW_LENGTH',
+      'GL_UNPACK_IMAGE_HEIGHT',
+      'GL_UNPACK_SKIP_PIXELS',
+      'GL_UNPACK_SKIP_ROWS',
+      'GL_UNPACK_SKIP_IMAGES',

[piman, 2015/05/13 22:35:29]

most of these have an effect on the client only if a buffer isn't bound, so we
probably need to intercept them on the client.

[Zhenyao Mo, 2015/05/13 23:02:53]

Right, we need to intercept all of them on the client side.

Created crbug.com/487841 to track this.

[Zhenyao Mo, 2015/05/13 23:39:21]

Per offline discussion, these are still needed on the service side if service
side data are in use.

+    ],
     'invalid': [
       'GL_PACK_SWAP_BYTES',
       'GL_UNPACK_SWAP_BYTES',
     ],
   },
   'PixelStoreAlignment': {
     'type': 'GLint',
     'valid': [
       '1',
       '2',
       '4',
       '8',
     ],
     'invalid': [
       '3',
       '9',
     ],
   },
   'ReadPixelFormat': {
     'type': 'GLenum',
     'valid': [
       'GL_ALPHA',
       'GL_RGB',
       'GL_RGBA',
     ],
+    'valid_es3': [
+      'GL_RGBA_INTEGER',
+    ],
+    'deprecated_es3': [
+      'GL_ALPHA',
+      'GL_RGB',
+    ],
   },
   'PixelType': {
     'type': 'GLenum',
     'valid': [
       'GL_UNSIGNED_BYTE',
       'GL_UNSIGNED_SHORT_5_6_5',
       'GL_UNSIGNED_SHORT_4_4_4_4',
       'GL_UNSIGNED_SHORT_5_5_5_1',
     ],
     'valid_es3': [
@@ skipping 17 matching lines @@
   'ReadPixelType': {
     'type': 'GLenum',
     'valid': [
       'GL_UNSIGNED_BYTE',
       'GL_UNSIGNED_SHORT_5_6_5',
       'GL_UNSIGNED_SHORT_4_4_4_4',
       'GL_UNSIGNED_SHORT_5_5_5_1',
     ],
     'invalid': [
       'GL_SHORT',
+    ],
+    'valid_es3': [
+      'GL_UNSIGNED_INT',
       'GL_INT',
+      'GL_FLOAT',
+    ],
+    'deprecated_es3': [
+      'GL_UNSIGNED_SHORT_5_6_5',
+      'GL_UNSIGNED_SHORT_4_4_4_4',
+      'GL_UNSIGNED_SHORT_5_5_5_1',
     ],
   },
   'RenderBufferFormat': {
     'type': 'GLenum',
     'valid': [
       'GL_RGBA4',
       'GL_RGB565',
       'GL_RGB5_A1',
       'GL_DEPTH_COMPONENT16',
       'GL_STENCIL_INDEX8',
     ],
+    'valid_es3': [
+      'GL_R8',
+      'GL_R8UI',
+      'GL_R8I',
+      'GL_R16UI',
+      'GL_R16I',
+      'GL_R32UI',
+      'GL_R32I',
+      'GL_RG8',
+      'GL_RG8UI',
+      'GL_RG8I',
+      'GL_RG16UI',
+      'GL_RG16I',
+      'GL_RG32UI',
+      'GL_RG32I',
+      'GL_RGB8',
+      'GL_RGBA8',
+      'GL_SRGB8_ALPHA8',
+      'GL_RGB10_A2',
+      'GL_RGBA8UI',
+      'GL_RGBA8I',
+      'GL_RGB10_A2UI',
+      'GL_RGBA16UI',
+      'GL_RGBA16I',
+      'GL_RGBA32UI',
+      'GL_RGBA32I',
+      'GL_DEPTH_COMPONENT24',
+      'GL_DEPTH_COMPONENT32F',
+      'GL_DEPTH24_STENCIL8',
+      'GL_DEPTH32F_STENCIL8',
+    ],
   },
   'ShaderBinaryFormat': {
     'type': 'GLenum',
     'valid': [
     ],
   },
   'StencilOp': {
     'type': 'GLenum',
     'valid': [
       'GL_KEEP',
@@ skipping 245 matching lines @@
       'GL_NEAREST',
     ],
   },
   'VertexAttribType': {
     'type': 'GLenum',
     'valid': [
       'GL_BYTE',
       'GL_UNSIGNED_BYTE',
       'GL_SHORT',
       'GL_UNSIGNED_SHORT',
-    #  'GL_FIXED',  // This is not available on Desktop GL.
+      # 'GL_FIXED',  // This is not available on Desktop GL.
       'GL_FLOAT',
     ],
+    'valid_es3': [
+      'GL_INT',
+      'GL_UNSIGNED_INT',
+      'GL_HALF_FLOAT',
+      'GL_INT_2_10_10_10_REV',
+      'GL_UNSIGNED_INT_2_10_10_10_REV',
+    ],
     'invalid': [
       'GL_DOUBLE',
     ],
   },
   'VertexAttribIType': {
     'type': 'GLenum',
     'valid': [
       'GL_BYTE',
       'GL_UNSIGNED_BYTE',
       'GL_SHORT',
@@ skipping 9167 matching lines @@
   Format(gen.generated_cpp_filenames)
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
     return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))