Revert 89002 - Enforce RGB even on buggy drivers.

gpu/command_buffer/build_gles2_cmd_buffer.py

 #!/usr/bin/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
@@ skipping 1116 matching lines @@
     'decoder_func': 'DoCheckFramebufferStatus',
     'gl_test_func': 'glCheckFramebufferStatusEXT',
     'result': ['GLenum'],
   },
   'Clear': {'decoder_func': 'DoClear'},
   'ClearColor': {'decoder_func': 'DoClearColor'},
   'ClearDepthf': {
     'decoder_func': 'DoClearDepthf',
     'gl_test_func': 'glClearDepth',
   },
-  'ColorMask': {'decoder_func': 'DoColorMask', 'expectation': False},
+  'ColorMask': {'decoder_func': 'DoColorMask'},
   'ClearStencil': {'decoder_func': 'DoClearStencil'},
   'CommandBufferEnableCHROMIUM': {
     'type': 'Custom',
     'immediate': False,
     'decoder_func': 'DoCommandBufferEnableCHROMIUM',
     'expectation': False,
     'cmd_args': 'GLuint bucket_id, GLint* result',
     'result': ['GLint'],
     'extension': True,
     'chromium': True,
@@ skipping 37 matching lines @@
     'type': 'Custom',
     'decoder_func': 'DoDeleteSharedIdsCHROMIUM',
     'impl_func': False,
     'expectation': False,
     'immediate': False,
     'extension': True,
     'chromium': True,
   },
   'DeleteTextures': {'type': 'DELn'},
   'DepthRangef': {'decoder_func': 'glDepthRange'},
-  'DepthMask': {'decoder_func': 'DoDepthMask', 'expectation': False},
+  'DepthMask': {'decoder_func': 'DoDepthMask'},
   'DetachShader': {'decoder_func': 'DoDetachShader'},
   'Disable': {
     'decoder_func': 'DoDisable',
   },
   'DisableVertexAttribArray': {
     'decoder_func': 'DoDisableVertexAttribArray',
     'impl_decl': False,
   },
   'DrawArrays': {
     'decoder_func': 'DoDrawArrays',
@@ skipping 294 matching lines @@
   },
   'ShaderBinary': {'type': 'Custom'},
   'ShaderSource': {
     'type': 'Manual',
     'immediate': True,
     'bucket': True,
     'needs_size': True,
     'cmd_args':
         'GLuint shader, const char* data',
   },
-  'StencilMask': {'decoder_func': 'DoStencilMask', 'expectation': False},
-  'StencilMaskSeparate': {
-    'decoder_func': 'DoStencilMaskSeparate',
-    'expectation': False,
-  },
+  'StencilMask': {'decoder_func': 'DoStencilMask'},
+  'StencilMaskSeparate': {'decoder_func': 'DoStencilMaskSeparate'},
   'SwapBuffers': {
     'type': 'Custom',
     'impl_func': False,
     'unit_test': False,
     'extension': True,
   },
   'TexImage2D': {'type': 'Manual', 'immediate': True},
   'TexParameterf': {
     'decoder_func': 'DoTexParameterf',
     'valid_args': {
@@ skipping 2742 matching lines @@
     pass
 
   def GetImmediateVersion(self):
     """Gets the immediate version of this argument."""
     return self
 
   def GetBucketVersion(self):
     """Gets the bucket version of this argument."""
     return self
 
-
-class BoolArgument(Argument):
-  """class for GLboolean"""
-
-  def __init__(self, name, type):
-    Argument.__init__(self, name, 'GLboolean')
-
-  def GetValidArg(self, func, offset, index):
-    """Gets a valid value for this argument."""
-    return 'true'
-
-  def GetValidGLArg(self, func, offset, index):
-    """Gets a valid GL value for this argument."""
-    return 'true'
-
-
 class DataSizeArgument(Argument):
   """class for data_size which Bucket commands do not need."""
 
   def __init__(self, name):
     Argument.__init__(self, name, "uint32")
 
   def GetBucketVersion(self):
     return None
 
 
@@ skipping 44 matching lines @@
     """overridden from SizeArgument."""
     pass
     #file.Write("  if (%s < 0) {\n" % self.name)
     #file.Write("    SetGLError(GL_INVALID_VALUE, \"gl%s: %s < 0\");\n" %
     #           (func.original_name, self.name))
     #file.Write("    return error::kNoError;\n")
     #file.Write("  }\n")
 
 
 class EnumBaseArgument(Argument):
-  """Base class for EnumArgument, IntArgument and ValidatedBoolArgument"""
+  """Base class for EnumArgument, IntArgument and BoolArgument"""
 
   def __init__(self, name, gl_type, type, gl_error):
     Argument.__init__(self, name, gl_type)
 
     self.local_type = type
     self.gl_error = gl_error
     name = type[len(gl_type):]
     self.type_name = name
     self.enum_info = _ENUM_LISTS[name]
 
@@ skipping 49 matching lines @@
   """A class for a GLint argument that can only except specific values.
 
   For example glTexImage2D takes a GLint for its internalformat
   argument instead of a GLenum.
   """
 
   def __init__(self, name, type):
     EnumBaseArgument.__init__(self, name, "GLint", type, "GL_INVALID_VALUE")
 
 
-class ValidatedBoolArgument(EnumBaseArgument):
+class BoolArgument(EnumBaseArgument):
   """A class for a GLboolean argument that can only except specific values.
 
   For example glUniformMatrix takes a GLboolean for it's transpose but it
   must be false.
   """
 
   def __init__(self, name, type):
     EnumBaseArgument.__init__(self, name, "GLboolean", type, "GL_INVALID_VALUE")
 
 
@@ skipping 633 matching lines @@
   # Is this a resource argument? Must come after pointer check.
   elif arg_parts[0].startswith('GLidBind'):
     return ResourceIdBindArgument(arg_parts[-1], " ".join(arg_parts[0:-1]))
   elif arg_parts[0].startswith('GLidZero'):
     return ResourceIdZeroArgument(arg_parts[-1], " ".join(arg_parts[0:-1]))
   elif arg_parts[0].startswith('GLid'):
     return ResourceIdArgument(arg_parts[-1], " ".join(arg_parts[0:-1]))
   elif arg_parts[0].startswith('GLenum') and len(arg_parts[0]) > 6:
     return EnumArgument(arg_parts[-1], " ".join(arg_parts[0:-1]))
   elif arg_parts[0].startswith('GLboolean') and len(arg_parts[0]) > 9:
-    return ValidatedBoolArgument(arg_parts[-1], " ".join(arg_parts[0:-1]))
-  elif arg_parts[0].startswith('GLboolean'):
     return BoolArgument(arg_parts[-1], " ".join(arg_parts[0:-1]))
   elif (arg_parts[0].startswith('GLint') and len(arg_parts[0]) > 5 and
         not arg_parts[0].startswith('GLintptr')):
     return IntArgument(arg_parts[-1], " ".join(arg_parts[0:-1]))
   elif (arg_parts[0].startswith('GLsizeiNotNegative') or
         arg_parts[0].startswith('GLintptrNotNegative')):
     return SizeNotNegativeArgument(arg_parts[-1],
                                    " ".join(arg_parts[0:-1]),
                                    arg_parts[0][0:-11])
   elif arg_parts[0].startswith('GLsize'):
@@ skipping 718 matching lines @@
 
     if options.generate_docs:
       gen.WriteDocs("docs/gles2_cmd_format_docs_autogen.h")
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
     sys.exit(1)
 
 if __name__ == '__main__':
   main(sys.argv[1:])