Add initial support for NV_path_rendering extension to gpu command buffer

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 461 matching lines @@
         'expected': 'kViewportWidth',
       },
       {
         'name': 'viewport_height',
         'type': 'GLsizei',
         'default': '1',
         'expected': 'kViewportHeight',
       },
     ],
   },
+  'MatrixValuesCHROMIUM': {
+    'type': 'NamedParameter',
+    'func': 'MatrixLoadfEXT',
+    'states': [
+      { 'enum': 'GL_MODELVIEW_MATRIX_CHROMIUM',
+        'enum_set': 'GL_MODELVIEW_CHROMIUM',
+        'name': 'modelview_matrix',
+        'type': 'GLfloat',
+        'default': ['0.0f'] * 16,

[Kimmo Kinnunen, 2014/04/15 17:52:27]

This is a mistake, the these defaults should be identity matrices..

[Kimmo Kinnunen, 2014/04/23 12:26:55]

Done.

+        'extension_flag': 'chromium_path_rendering',
+      },
+      { 'enum': 'GL_PROJECTION_MATRIX_CHROMIUM',
+        'enum_set': 'GL_PROJECTION_CHROMIUM',
+        'name': 'projection_matrix',
+        'type': 'GLfloat',
+        'default': ['0.0f'] * 16,
+        'extension_flag': 'chromium_path_rendering',
+      },
+    ],
+  },
 }
 
 # 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 306 matching lines @@
   },
   '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',
     ],
   },
+  'MatrixMode': {
+    'type': 'GLenum',
+    'valid': [
+      'GL_PROJECTION_CHROMIUM',
+      'GL_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',
@@ skipping 1721 matching lines @@
     'chromium': True,
   },
   'ScheduleOverlayPlaneCHROMIUM': {
       'type': 'Custom',
       'impl_func': True,
       'unit_test': False,
       'client_test': False,
       'extension': True,
       'chromium': True,
   },
+  'MatrixLoadfCHROMIUM': {
+    'type': 'PUT',
+    'count': 16,
+    'data_type': 'GLfloat',
+    'decoder_func': 'DoMatrixLoadfCHROMIUM',
+    'unit_test': False,
+    'chromium': True,
+    'extension': True,
+  },
+  'MatrixLoadIdentityCHROMIUM': {
+    'decoder_func': 'DoMatrixLoadIdentityCHROMIUM',
+    'unit_test': False,
+    'chromium': True,
+    'extension': True,
+  },
 }
 
-
 def Grouper(n, iterable, fillvalue=None):
   """Collect data into fixed-length chunks or blocks"""
   args = [iter(iterable)] * n
   return itertools.izip_longest(fillvalue=fillvalue, *args)
 
 
 def SplitWords(input_string):
   """Transforms a input_string into a list of lower-case components.
 
   Args:
@@ skipping 4514 matching lines @@
         "// It is included by context_state.h\n")
     file.Write("struct EnableFlags {\n")
     file.Write("  EnableFlags();\n")
     for capability in _CAPABILITY_FLAGS:
       file.Write("  bool %s;\n" % capability['name'])
     file.Write("};\n\n")
 
     for state_name in sorted(_STATES.keys()):
       state = _STATES[state_name]
       for item in state['states']:
-        file.Write("%s %s;\n" % (item['type'], item['name']))
+        if isinstance(item['default'], list):
+          file.Write("%s %s[%s];\n" % (item['type'], item['name'],
+                                       len(item['default'])))

[vmiura, 2014/04/15 18:02:43]

nit: %d for len(..)

[Kimmo Kinnunen, 2014/04/23 12:26:55]

Done.

+        else:
+          file.Write("%s %s;\n" % (item['type'], item['name']))
     file.Write("\n")
 
     file.Close()
 
   def WriteClientContextStateHeader(self, filename):
     """Writes the client context state header."""
     file = CHeaderWriter(
         filename,
         "// It is included by client_context_state.h\n")
     file.Write("struct EnableFlags {\n")
@@ skipping 19 matching lines @@
           file.Write("      *num_written = %d;\n" % len(state['states']))
           file.Write("      if (params) {\n")
           for ndx,item in enumerate(state['states']):
             file.Write("        params[%d] = static_cast<%s>(%s);\n" %
                        (ndx, gl_type, item['name']))
           file.Write("      }\n")
           file.Write("      return true;\n")
         else:
           for item in state['states']:
             file.Write("    case %s:\n" % item['enum'])
-            file.Write("      *num_written = 1;\n")
-            file.Write("      if (params) {\n")
-            file.Write("        params[0] = static_cast<%s>(%s);\n" %
-                       (gl_type, item['name']))
+            if isinstance(item['default'], list):
+              item_len = len(item['default'])
+              file.Write("      *num_written = %s;\n" % item_len)

[vmiura, 2014/04/15 18:02:43]

nit: %d for item_len

[Kimmo Kinnunen, 2014/04/23 12:26:55]

Done.

+              file.Write("      if (params) {\n")
+              if item['type'] == gl_type:
+                file.Write("        memcpy(params, %s, sizeof(%s) * %s);\n" %
+                           (item['name'], item['type'], item_len))

[vmiura, 2014/04/15 18:02:43]

nit: %d for item_len

[Kimmo Kinnunen, 2014/04/23 12:26:55]

Done.

+              else:
+                file.Write("        for (size_t i = 0; i < %s; ++i) {\n" %
+                           item_len)
+                file.Write("          params[i] = static_cast<%s>(%s[i]);\n" %
+                           (gl_type, item['name']))
+                file.Write("        }\n");
+            else:
+              file.Write("      *num_written = 1;\n")
+              file.Write("      if (params) {\n")
+              file.Write("        params[0] = static_cast<%s>(%s);\n" %
+                         (gl_type, item['name']))
             file.Write("      }\n")
             file.Write("      return true;\n")
       for capability in _CAPABILITY_FLAGS:
             file.Write("    case GL_%s:\n" % capability['name'].upper())
             file.Write("      *num_written = 1;\n")
             file.Write("      if (params) {\n")
             file.Write(
                 "        params[0] = static_cast<%s>(enable_flags.%s);\n" %
                 (gl_type, capability['name']))
             file.Write("      }\n")
@@ skipping 15 matching lines @@
                   (capability['name'],
                    ('false', 'true')['default' in capability]))
     file.Write("ContextState::EnableFlags::EnableFlags()\n    : %s {\n}\n" %
                ",\n      ".join(code))
     file.Write("\n")
 
     file.Write("void ContextState::Initialize() {\n")
     for state_name in sorted(_STATES.keys()):
       state = _STATES[state_name]
       for item in state['states']:
-        file.Write("  %s = %s;\n" % (item['name'], item['default']))
+        if isinstance(item['default'], list):
+            for ndx, value in enumerate(item['default']):
+                file.Write("  %s[%s] = %s;\n" % (item['name'], ndx, value))

[vmiura, 2014/04/15 18:02:43]

nit: %d for ndx

[Kimmo Kinnunen, 2014/04/23 12:26:55]

Done.

+        else:
+            file.Write("  %s = %s;\n" % (item['name'], item['default']))
     file.Write("}\n")
 
     file.Write("""
 void ContextState::InitCapabilities(const ContextState* prev_state) const {
 """)
     def WriteCapabilities(test_prev):
       for capability in _CAPABILITY_FLAGS:
         capability_name = capability['name']
         if test_prev:
           file.Write("  if (prev_state->enable_flags.%s != enable_flags.%s)\n" %
@@ skipping 33 matching lines @@
               file.Write(")\n")
             file.Write(
                 "  gl%s(%s, %s);\n" %
                 (state['func'], ('GL_FRONT', 'GL_BACK')[ndx], ", ".join(args)))
         elif state['type'] == 'NamedParameter':
           for item in state['states']:
             if 'extension_flag' in item:
               file.Write("  if (feature_info_->feature_flags().%s)\n  " %
                          item['extension_flag'])
             if test_prev:
-              file.Write("  if (prev_state->%s != %s)\n" %
-                         (item['name'], item['name']))
+              if isinstance(item['default'], list):
+                file.Write("  if (memcmp(prev_state->%s, %s, "
+                           "sizeof(%s) * %s))\n" %
+                           (item['name'], item['name'], item['type'],
+                            len(item['default'])))

[vmiura, 2014/04/15 18:02:43]

nit: %d

[Kimmo Kinnunen, 2014/04/23 12:26:55]

Done.

+              else:
+                file.Write("  if (prev_state->%s != %s)\n" %
+                           (item['name'], item['name']))
             file.Write("  gl%s(%s, %s);\n" %
-                       (state['func'], item['enum'], item['name']))
+                       (state['func'],
+                        (item['enum_set']
+                           if 'enum_set' in item else item['enum']),
+                        item['name']))
         else:
+          if 'extension_flag' in state:
+            file.Write("  if (feature_info_->feature_flags().%s)\n  " %
+                       state['extension_flag'])
           if test_prev:
             file.Write("  if (")
           args = []
           for place, item in enumerate(state['states']):
             item_name = item['name']
             args.append('%s' % item_name)
             if test_prev:
               if place > 0:
                 file.Write(' ||\n')
               file.Write("(%s != prev_state->%s)" %
                          (item_name, item_name))
           if test_prev:
             file.Write("    )\n")
           file.Write("  gl%s(%s);\n" % (state['func'], ", ".join(args)))
 
     file.Write("  if (prev_state) {")
     WriteStates(True)
     file.Write("  } else {")
     WriteStates(False)
     file.Write("  }")
-
     file.Write("}\n")
 
     file.Write("""bool ContextState::GetEnabled(GLenum cap) const {
   switch (cap) {
 """)
     for capability in _CAPABILITY_FLAGS:
       file.Write("    case GL_%s:\n" % capability['name'].upper())
       file.Write("      return enable_flags.%s;\n" % capability['name'])
     file.Write("""    default:
       NOTREACHED();
@@ skipping 148 matching lines @@
               "  EXPECT_CALL(*gl_, %s(%s, %s))\n" %
               (state['func'], ('GL_FRONT', 'GL_BACK')[ndx], ", ".join(args)))
           file.Write("      .Times(1)\n")
           file.Write("      .RetiresOnSaturation();\n")
       elif state['type'] == 'NamedParameter':
         for item in state['states']:
           if 'extension_flag' in item:
             continue
           file.Write(
               "  EXPECT_CALL(*gl_, %s(%s, %s))\n" %
-              (state['func'], item['enum'], item['default']))
+              (state['func'],
+               (item['enum_set']
+                           if 'enum_set' in item else item['enum']),
+               item['default']))
           file.Write("      .Times(1)\n")
           file.Write("      .RetiresOnSaturation();\n")
       else:
         args = []
         for item in state['states']:
           if 'expected' in item:
             args.append(item['expected'])
           else:
             args.append(item['default'])
         file.Write("  EXPECT_CALL(*gl_, %s(%s))\n" %
@@ skipping 428 matching lines @@
       "empty. Use this if you want the result stored under gen.")
   parser.add_option(
       "-v", "--verbose", action="store_true",
       help="prints more output.")
 
   (options, args) = parser.parse_args(args=argv)
 
   # Add in states and capabilites to GLState
   for state_name in sorted(_STATES.keys()):
     state = _STATES[state_name]
+    if 'extension_flag' in state:
+      continue
     if 'enum' in state:
       _ENUM_LISTS['GLState']['valid'].append(state['enum'])
     else:
       for item in state['states']:
         if 'extension_flag' in item:
           continue
         _ENUM_LISTS['GLState']['valid'].append(item['enum'])
   for capability in _CAPABILITY_FLAGS:
     _ENUM_LISTS['GLState']['valid'].append("GL_%s" % capability['name'].upper())
 
@@ skipping 83 matching lines @@
       "ppapi/shared_impl/ppb_opengles2_shared.cc"])
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
     return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))