Update ES3 enums for texture parameters.

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 529 matching lines @@
 }
 
 # Named type info object represents a named type that is used in OpenGL call
 # arguments.  Each named type defines a set of valid OpenGL call arguments.  The
 # named types are used in 'cmd_buffer_functions.txt'.
 # type: The actual GL type of the named type.
 # valid: The list of values that are valid for both the client and the service.
 # valid_es3: The list of values that are valid in OpenGL ES 3, but not ES 2.
 # invalid: Examples of invalid values for the type. At least these values
 #          should be tested to be invalid.
+# invalid_es3: The list of values that are valid in OpenGL ES2, but not ES3.
 # is_complete: The list of valid values of type are final and will not be
 #              modified during runtime.
 _NAMED_TYPE_INFO = {
   'BlitFilter': {
     'type': 'GLenum',
     'valid': [
       'GL_NEAREST',
       'GL_LINEAR',
     ],
     'invalid': [
@@ skipping 209 matching lines @@
     'invalid': [
       'GL_TEXTURE_2D',
     ]
   },
   'TextureBindTarget': {
     'type': 'GLenum',
     'valid': [
       'GL_TEXTURE_2D',
       'GL_TEXTURE_CUBE_MAP',
     ],
+    'valid_es3': [
+      'GL_TEXTURE_3D',
+      'GL_TEXTURE_2D_ARRAY',
+    ],
     'invalid': [
       'GL_TEXTURE_1D',
       'GL_TEXTURE_3D',
     ],
   },
   'TransformFeedbackBindTarget': {
     'type': 'GLenum',
     'valid': [
       'GL_TRANSFORM_FEEDBACK',
     ],
@@ skipping 427 matching lines @@
     ],
   },
   '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': [
+      'GL_BYTE',
+      'GL_UNSIGNED_SHORT',
+      'GL_SHORT',
+      'GL_UNSIGNED_INT',
+      'GL_INT',
+      'GL_HALF_FLOAT',
+      'GL_FLOAT',
+      'GL_UNSIGNED_INT_2_10_10_10_REV',
+      'GL_UNSIGNED_INT_10F_11F_11F_REV',
+      'GL_UNSIGNED_INT_5_9_9_9_REV',
+      'GL_UNSIGNED_INT_24_8',
+      'GL_FLOAT_32_UNSIGNED_INT_24_8_REV',
+    ],
     'invalid': [
-      'GL_SHORT',
-      'GL_INT',

[no sievers, 2015/03/13 19:44:17]

Note that GLES2DecoderTest.ReadPixelsInvalidArgs verifies that GL_INT is invalid
(it's a manually written test).
Which means this test would fail if you ran it with the underlying version set
to ES3.

Which brings up the general question of what's to become of the decoder
unittests with ES3 underneath? If validation moves to Angle a lot of tests
become invalid. For those that are still valid, we'll eventually have to
separate them out and run them with different version strings.

Otherwise, it seems that all other commands that use this are manual (or specify
unit_test = false).

[Zhenyao Mo, 2015/03/13 20:25:13]

Once we switch to MANGLE, all the command buffer unit tests with invalid enums
will have to be deleted.  Note that it's exactly the case for commands with
'unsafe' set to True, where the code generator bypasses all the invalid test
generation.

+      'GL_UNSIGNED_BYTE_3_3_2',
     ],
   },
   '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',
     ],
@@ skipping 32 matching lines @@
   },
   'TextureFormat': {
     'type': 'GLenum',
     'valid': [
       'GL_ALPHA',
       'GL_LUMINANCE',
       'GL_LUMINANCE_ALPHA',
       'GL_RGB',
       'GL_RGBA',
     ],
+    'valid_es3': [
+      'GL_RED',
+      'GL_RED_INTEGER',
+      'GL_RG',
+      'GL_RG_INTEGER',
+      'GL_RGB_INTEGER',
+      'GL_RGBA_INTEGER',
+      'GL_DEPTH_COMPONENT',
+      'GL_DEPTH_STENCIL',
+    ],
     'invalid': [
       'GL_BGRA',
       'GL_BGR',
     ],
   },
   'TextureInternalFormat': {
     'type': 'GLenum',
     'valid': [
       'GL_ALPHA',
       'GL_LUMINANCE',
       'GL_LUMINANCE_ALPHA',
       'GL_RGB',
       'GL_RGBA',
     ],
+    'valid_es3': [
+      'GL_R8',
+      'GL_R8_SNORM',
+      'GL_R16F',
+      'GL_R32F',
+      'GL_R8UI',
+      'GL_R8I',
+      'GL_R16UI',
+      'GL_R16I',
+      'GL_R32UI',
+      'GL_R32I',
+      'GL_RG8',
+      'GL_RG8_SNORM',
+      'GL_RG16F',
+      'GL_RG32F',
+      'GL_RG8UI',
+      'GL_RG8I',
+      'GL_RG16UI',
+      'GL_RG16I',
+      'GL_RG32UI',
+      'GL_RG32I',
+      'GL_RGB8',
+      'GL_SRGB8',
+      'GL_RGB565',
+      'GL_RGB8_SNORM',
+      'GL_R11F_G11F_B10F',
+      'GL_RGB9_E5',
+      'GL_RGB16F',
+      'GL_RGB32F',
+      'GL_RGB8UI',
+      'GL_RGB8I',
+      'GL_RGB16UI',
+      'GL_RGB16I',
+      'GL_RGB32UI',
+      'GL_RGB32I',
+      'GL_RGBA8',
+      'GL_SRGB8_ALPHA8',
+      'GL_RGBA8_SNORM',
+      'GL_RGB5_A1',
+      'GL_RGBA4',
+      'GL_RGB10_A2',
+      'GL_RGBA16F',
+      'GL_RGBA32F',
+      'GL_RGBA8UI',
+      'GL_RGBA8I',
+      'GL_RGB10_A2UI',
+      'GL_RGBA16UI',
+      'GL_RGBA16I',
+      'GL_RGBA32UI',
+      'GL_RGBA32I',
+      # The DEPTH/STENCIL formats are not supported in CopyTexImage2D.
+      # We will reject them dynamically in GPU command buffer.
+      'GL_DEPTH_COMPONENT16',
+      'GL_DEPTH_COMPONENT24',
+      'GL_DEPTH_COMPONENT32F',
+      'GL_DEPTH24_STENCIL8',
+      'GL_DEPTH32F_STENCIL8',
+    ],
     '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',
     ],
+    'valid_es3': [
+      'GL_R8',
+      'GL_R8_SNORM',
+      'GL_R16F',
+      'GL_R32F',
+      'GL_R8UI',
+      'GL_R8I',
+      'GL_R16UI',
+      'GL_R16I',
+      'GL_R32UI',
+      'GL_R32I',
+      'GL_RG8',
+      'GL_RG8_SNORM',
+      'GL_RG16F',
+      'GL_RG32F',
+      'GL_RG8UI',
+      'GL_RG8I',
+      'GL_RG16UI',
+      'GL_RG16I',
+      'GL_RG32UI',
+      'GL_RG32I',
+      'GL_SRGB8',
+      'GL_RGB8_SNORM',
+      'GL_R11F_G11F_B10F',
+      'GL_RGB9_E5',
+      'GL_RGB16F',
+      'GL_RGB32F',
+      'GL_RGB8UI',
+      'GL_RGB8I',
+      'GL_RGB16UI',
+      'GL_RGB16I',
+      'GL_RGB32UI',
+      'GL_RGB32I',
+      'GL_SRGB8_ALPHA8',
+      'GL_RGBA8_SNORM',
+      'GL_RGB10_A2',
+      'GL_RGBA16F',
+      'GL_RGBA32F',
+      'GL_RGBA8UI',
+      'GL_RGBA8I',
+      'GL_RGB10_A2UI',
+      'GL_RGBA16UI',
+      'GL_RGBA16I',
+      'GL_RGBA32UI',
+      'GL_RGBA32I',
+      'GL_DEPTH_COMPONENT16',
+      'GL_DEPTH_COMPONENT24',
+      'GL_DEPTH_COMPONENT32F',
+      'GL_DEPTH24_STENCIL8',
+      'GL_DEPTH32F_STENCIL8',
+      'GL_COMPRESSED_R11_EAC',
+      'GL_COMPRESSED_SIGNED_R11_EAC',
+      'GL_COMPRESSED_RG11_EAC',
+      'GL_COMPRESSED_SIGNED_RG11_EAC',
+      'GL_COMPRESSED_RGB8_ETC2',
+      'GL_COMPRESSED_SRGB8_ETC2',
+      'GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2',
+      'GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2',
+      'GL_COMPRESSED_RGBA8_ETC2_EAC',
+      'GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC',
+    ],
+    'invalid_es3': [

[no sievers, 2015/03/13 19:44:18]

Ok, I think now I find this slightly confusing because of the name.

'invalid' means that it should generate a unit test if possible.
Otherwise you don't need to specify invalid ones because 'is not in valid list'
implies invalid.

Should this really be called 'deprecated_es3'?

[Zhenyao Mo, 2015/03/13 20:25:14]

Done.

+      'GL_ALPHA8_EXT',
+      'GL_LUMINANCE8_EXT',
+      'GL_LUMINANCE8_ALPHA8_EXT',
+      'GL_ALPHA16F_EXT',
+      'GL_LUMINANCE16F_EXT',
+      'GL_LUMINANCE_ALPHA16F_EXT',
+      'GL_ALPHA32F_EXT',
+      'GL_LUMINANCE32F_EXT',
+      'GL_LUMINANCE_ALPHA32F_EXT',
+    ],
   },
   'ImageInternalFormat': {
     'type': 'GLenum',
     'valid': [
       'GL_RGB',
       'GL_RGBA',
     ],
   },
   'ImageUsage': {
     'type': 'GLenum',
@@ skipping 6224 matching lines @@
     self.info = info
     self.valid = info['valid']
     if 'invalid' in info:
       self.invalid = info['invalid']
     else:
       self.invalid = []
     if 'valid_es3' in info:
       self.valid_es3 = info['valid_es3']
     else:
       self.valid_es3 = []
+    if 'invalid_es3' in info:
+      self.invalid_es3 = info['invalid_es3']
+    else:
+      self.invalid_es3 = []
 
   def GetType(self):
     return self.info['type']
 
   def GetInvalidValues(self):
     return self.invalid
 
   def GetValidValues(self):
     return self.valid
 
   def GetValidValuesES3(self):
     return self.valid_es3
 
+  def GetInvalidValuesES3(self):
+    return self.invalid_es3
+
   def IsConstant(self):
     if not 'is_complete' in self.info:
       return False
 
     return len(self.GetValidValues()) == 1
 
   def GetConstantValue(self):
     return self.GetValidValues()[0]
 
 class Argument(object):
@@ skipping 2286 matching lines @@
           file.Write("  %s,\n" % value)
         file.Write("};\n")
         file.Write("\n")
       if named_type.GetValidValuesES3():
         file.Write("static const %s valid_%s_table_es3[] = {\n" %
                    (named_type.GetType(), ToUnderscore(name)))
         for value in named_type.GetValidValuesES3():
           file.Write("  %s,\n" % value)
         file.Write("};\n")
         file.Write("\n")
+      if named_type.GetInvalidValuesES3():
+        file.Write("static const %s invalid_%s_table_es3[] = {\n" %
+                   (named_type.GetType(), ToUnderscore(name)))
+        for value in named_type.GetInvalidValuesES3():
+          file.Write("  %s,\n" % value)
+        file.Write("};\n")
+        file.Write("\n")
     file.Write("Validators::Validators()")
     pre = '    : '
     for count, name in enumerate(names):
       named_type = NamedType(_NAMED_TYPE_INFO[name])
       if named_type.IsConstant():
         continue
       if named_type.GetValidValues():
         code = """%(pre)s%(name)s(
           valid_%(name)s_table, arraysize(valid_%(name)s_table))"""
       else:
         code = "%(pre)s%(name)s()"
       file.Write(code % {
         'name': ToUnderscore(name),
         'pre': pre,
       })
       pre = ',\n    '
     file.Write(" {\n");
     file.Write("}\n\n");
 
-    file.Write("void Validators::AddES3Values() {\n")
+    file.Write("void Validators::UpdateValuesES3() {\n")
     for name in names:
       named_type = NamedType(_NAMED_TYPE_INFO[name])
+      if named_type.GetInvalidValuesES3():
+        code = """  %(name)s.RemoveValues(
+      invalid_%(name)s_table_es3, arraysize(invalid_%(name)s_table_es3));
+"""
+        file.Write(code % {
+          'name': ToUnderscore(name),
+        })
       if named_type.GetValidValuesES3():
         code = """  %(name)s.AddValues(
       valid_%(name)s_table_es3, arraysize(valid_%(name)s_table_es3));
 """
         file.Write(code % {
           'name': ToUnderscore(name),
         })
     file.Write("}\n\n");
     file.Close()
     self.generated_cpp_filenames.append(file.filename)
@@ skipping 417 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:]))