Revert of Add subscribeUniform extension pipeline (patchset #7 id:460…

…001 of https://codereview.chromium.org/659903002/) Reason for revert: buildbot memory failure on Linux Tests Original issue's description: > Add subscribeUniform extension pipeline > > BUG=422978 > > Committed: https://crrev.com/80b40cc8eab5e6bef6221c0bc5c1d006059acd8f > Cr-Commit-Position: refs/heads/master@{#303050} TBR=kbr@chromium.org,bajones@chromium.org,piman@chromium.org,brianderson@chromium.org BUG=422978 Review URL: https://codereview.chromium.org/706903004 Cr-Commit-Position: refs/heads/master@{#303131}
dednal · Nov 7, 2014 · 1650e54 · 1650e54
1 parent e7faeb9
commit 1650e54
Show file tree

Hide file tree

Showing 48 changed files with 38 additions and 2,131 deletions.
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
@@ -186,7 +186,6 @@ test("gpu_unittests") {
     "command_buffer/service/gles2_cmd_decoder_unittest_programs.cc",
     "command_buffer/service/gles2_cmd_decoder_unittest_textures.cc",
     "command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc",
-    "command_buffer/service/gles2_cmd_decoder_unittest_valuebuffer.cc",
     "command_buffer/service/gl_surface_mock.cc",
     "command_buffer/service/gl_surface_mock.h",
     "command_buffer/service/gpu_scheduler_unittest.cc",
@@ -198,7 +197,6 @@ test("gpu_unittests") {
     "command_buffer/service/mocks.cc",
     "command_buffer/service/mocks.h",
     "command_buffer/service/program_manager_unittest.cc",
-    "command_buffer/service/valuebuffer_manager_unittest.cc",
     "command_buffer/service/query_manager_unittest.cc",
     "command_buffer/service/renderbuffer_manager_unittest.cc",
     "command_buffer/service/program_cache_unittest.cc",

diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_subscribe_uniform.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_subscribe_uniform.txt
diff --git a/gpu/GLES2/gl2chromium_autogen.h b/gpu/GLES2/gl2chromium_autogen.h
@@ -218,14 +218,6 @@
 #define glCreateAndConsumeTextureCHROMIUM \
   GLES2_GET_FUN(CreateAndConsumeTextureCHROMIUM)
 #define glBindUniformLocationCHROMIUM GLES2_GET_FUN(BindUniformLocationCHROMIUM)
-#define glGenValuebuffersCHROMIUM GLES2_GET_FUN(GenValuebuffersCHROMIUM)
-#define glDeleteValuebuffersCHROMIUM GLES2_GET_FUN(DeleteValuebuffersCHROMIUM)
-#define glIsValuebufferCHROMIUM GLES2_GET_FUN(IsValuebufferCHROMIUM)
-#define glBindValuebufferCHROMIUM GLES2_GET_FUN(BindValuebufferCHROMIUM)
-#define glSubscribeValueCHROMIUM GLES2_GET_FUN(SubscribeValueCHROMIUM)
-#define glPopulateSubscribedValuesCHROMIUM \
-  GLES2_GET_FUN(PopulateSubscribedValuesCHROMIUM)
-#define glUniformValuebufferCHROMIUM GLES2_GET_FUN(UniformValuebufferCHROMIUM)
 #define glBindTexImage2DCHROMIUM GLES2_GET_FUN(BindTexImage2DCHROMIUM)
 #define glReleaseTexImage2DCHROMIUM GLES2_GET_FUN(ReleaseTexImage2DCHROMIUM)
 #define glTraceBeginCHROMIUM GLES2_GET_FUN(TraceBeginCHROMIUM)

diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h
@@ -687,35 +687,6 @@ typedef void (GL_APIENTRYP PFNGLWAITSYNCPOINTCHROMIUMPROC) (GLuint sync_point);
 #define GL_OVERLAY_TRANSFORM_ROTATE_270_CHROMIUM 0x924A
 #endif
 
-/* GL_CHROMIUM_subscribe_uniform */
-#ifndef GL_CHROMIUM_subscribe_uniform
-#define GL_CHROMIUM_subscribe_uniform 1
-
-#ifndef GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM
-#define GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM 0x924B
-#endif
-
-#ifndef GL_MOUSE_POSITION_CHROMIUM
-#define GL_MOUSE_POSITION_CHROMIUM 0x924C
-#endif
-
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY
-glGenValuebuffersCHROMIUM(GLsizei n, GLuint* buffers);
-GL_APICALL void GL_APIENTRY
-glDeleteValuebuffersCHROMIUM(GLsizei n, const GLuint* valuebuffers);
-GL_APICALL GLboolean GL_APIENTRY glIsValuebufferCHROMIUM(GLuint valuebuffer);
-GL_APICALL void GL_APIENTRY
-glBindValuebufferCHROMIUM(GLenum target, GLuint valuebuffer);
-GL_APICALL void GL_APIENTRY
-glSubscribeValueCHROMIUM(GLenum target, GLenum subscription);
-GL_APICALL void GL_APIENTRY glPopulateSubscribedValuesCHROMIUM(GLenum target);
-GL_APICALL void GL_APIENTRY glUniformValuebufferCHROMIUM(GLint location,
-                                                         GLenum target,
-                                                         GLenum subscription);
-#endif
-#endif /* GL_CHROMIUM_subscribe_uniform */
-
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY
     glScheduleOverlayPlaneCHROMIUM(GLint plane_z_order,

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -1195,18 +1195,6 @@
       'GL_SCANOUT_CHROMIUM'
     ],
   },
-  'ValueBufferTarget': {
-    'type': 'GLenum',
-    'valid': [
-      'GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM',
-    ],
-  },
-  'SubscriptionTarget': {
-    'type': 'GLenum',
-    'valid': [
-      'GL_MOUSE_POSITION_CHROMIUM',
-    ],
-  },
   'VertexAttribType': {
     'type': 'GLenum',
     'valid': [
@@ -1460,57 +1448,6 @@
     'extension': "CHROMIUM_texture_mailbox",
     'chromium': True,
   },
-  'GenValuebuffersCHROMIUM': {
-    'type': 'GENn',
-    'gl_test_func': 'glGenValuebuffersCHROMIUM',
-    'resource_type': 'Valuebuffer',
-    'resource_types': 'Valuebuffers',
-    'unit_test': False,
-    'extension': True,
-    'chromium': True,
-  },
-  'DeleteValuebuffersCHROMIUM': {
-    'type': 'DELn',
-    'gl_test_func': 'glDeleteValuebuffersCHROMIUM',
-    'resource_type': 'Valuebuffer',
-    'resource_types': 'Valuebuffers',
-    'unit_test': False,
-    'extension': True,
-    'chromium': True,
-  },
-  'IsValuebufferCHROMIUM': {
-    'type': 'Is',
-    'decoder_func': 'DoIsValuebufferCHROMIUM',
-    'expectation': False,
-    'extension': True,
-    'chromium': True,
-  },
-  'BindValuebufferCHROMIUM': {
-    'type': 'Bind',
-    'decoder_func': 'DoBindValueBufferCHROMIUM',
-    'gen_func': 'GenValueBuffersCHROMIUM',
-    'unit_test': False,
-    'extension': True,
-    'chromium': True,
-  },
-  'SubscribeValueCHROMIUM': {
-    'decoder_func': 'DoSubscribeValueCHROMIUM',
-    'unit_test': False,
-    'extension': True,
-    'chromium': True,
-  },
-  'PopulateSubscribedValuesCHROMIUM': {
-    'decoder_func': 'DoPopulateSubscribedValuesCHROMIUM',
-    'unit_test': False,
-    'extension': True,
-    'chromium': True,
-  },
-  'UniformValuebufferCHROMIUM': {
-    'decoder_func': 'DoUniformValueBufferCHROMIUM',
-    'unit_test': False,
-    'extension': True,
-    'chromium': True,
-  },
   'ClearStencil': {
     'type': 'StateSet',
     'state': 'ClearStencil',

diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
@@ -853,30 +853,6 @@ void GLES2BindUniformLocationCHROMIUM(GLuint program,
                                       const char* name) {
   gles2::GetGLContext()->BindUniformLocationCHROMIUM(program, location, name);
 }
-void GLES2GenValuebuffersCHROMIUM(GLsizei n, GLuint* buffers) {
-  gles2::GetGLContext()->GenValuebuffersCHROMIUM(n, buffers);
-}
-void GLES2DeleteValuebuffersCHROMIUM(GLsizei n, const GLuint* valuebuffers) {
-  gles2::GetGLContext()->DeleteValuebuffersCHROMIUM(n, valuebuffers);
-}
-GLboolean GLES2IsValuebufferCHROMIUM(GLuint valuebuffer) {
-  return gles2::GetGLContext()->IsValuebufferCHROMIUM(valuebuffer);
-}
-void GLES2BindValuebufferCHROMIUM(GLenum target, GLuint valuebuffer) {
-  gles2::GetGLContext()->BindValuebufferCHROMIUM(target, valuebuffer);
-}
-void GLES2SubscribeValueCHROMIUM(GLenum target, GLenum subscription) {
-  gles2::GetGLContext()->SubscribeValueCHROMIUM(target, subscription);
-}
-void GLES2PopulateSubscribedValuesCHROMIUM(GLenum target) {
-  gles2::GetGLContext()->PopulateSubscribedValuesCHROMIUM(target);
-}
-void GLES2UniformValuebufferCHROMIUM(GLint location,
-                                     GLenum target,
-                                     GLenum subscription) {
-  gles2::GetGLContext()->UniformValuebufferCHROMIUM(location, target,
-                                                    subscription);
-}
 void GLES2BindTexImage2DCHROMIUM(GLenum target, GLint imageId) {
   gles2::GetGLContext()->BindTexImage2DCHROMIUM(target, imageId);
 }
@@ -1754,34 +1730,6 @@ extern const NameToFunc g_gles2_function_table[] = {
      "glBindUniformLocationCHROMIUM",
      reinterpret_cast<GLES2FunctionPointer>(glBindUniformLocationCHROMIUM),
     },
-    {
-     "glGenValuebuffersCHROMIUM",
-     reinterpret_cast<GLES2FunctionPointer>(glGenValuebuffersCHROMIUM),
-    },
-    {
-     "glDeleteValuebuffersCHROMIUM",
-     reinterpret_cast<GLES2FunctionPointer>(glDeleteValuebuffersCHROMIUM),
-    },
-    {
-     "glIsValuebufferCHROMIUM",
-     reinterpret_cast<GLES2FunctionPointer>(glIsValuebufferCHROMIUM),
-    },
-    {
-     "glBindValuebufferCHROMIUM",
-     reinterpret_cast<GLES2FunctionPointer>(glBindValuebufferCHROMIUM),
-    },
-    {
-     "glSubscribeValueCHROMIUM",
-     reinterpret_cast<GLES2FunctionPointer>(glSubscribeValueCHROMIUM),
-    },
-    {
-     "glPopulateSubscribedValuesCHROMIUM",
-     reinterpret_cast<GLES2FunctionPointer>(glPopulateSubscribedValuesCHROMIUM),
-    },
-    {
-     "glUniformValuebufferCHROMIUM",
-     reinterpret_cast<GLES2FunctionPointer>(glUniformValuebufferCHROMIUM),
-    },
     {
      "glBindTexImage2DCHROMIUM",
      reinterpret_cast<GLES2FunctionPointer>(glBindTexImage2DCHROMIUM),

diff --git a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
@@ -1677,73 +1677,6 @@ void BindUniformLocationCHROMIUMBucket(GLuint program,
   }
 }
 
-void GenValuebuffersCHROMIUMImmediate(GLsizei n, GLuint* buffers) {
-  const uint32_t size =
-      gles2::cmds::GenValuebuffersCHROMIUMImmediate::ComputeSize(n);
-  gles2::cmds::GenValuebuffersCHROMIUMImmediate* c =
-      GetImmediateCmdSpaceTotalSize<
-          gles2::cmds::GenValuebuffersCHROMIUMImmediate>(size);
-  if (c) {
-    c->Init(n, buffers);
-  }
-}
-
-void DeleteValuebuffersCHROMIUMImmediate(GLsizei n,
-                                         const GLuint* valuebuffers) {
-  const uint32_t size =
-      gles2::cmds::DeleteValuebuffersCHROMIUMImmediate::ComputeSize(n);
-  gles2::cmds::DeleteValuebuffersCHROMIUMImmediate* c =
-      GetImmediateCmdSpaceTotalSize<
-          gles2::cmds::DeleteValuebuffersCHROMIUMImmediate>(size);
-  if (c) {
-    c->Init(n, valuebuffers);
-  }
-}
-
-void IsValuebufferCHROMIUM(GLuint valuebuffer,
-                           uint32_t result_shm_id,
-                           uint32_t result_shm_offset) {
-  gles2::cmds::IsValuebufferCHROMIUM* c =
-      GetCmdSpace<gles2::cmds::IsValuebufferCHROMIUM>();
-  if (c) {
-    c->Init(valuebuffer, result_shm_id, result_shm_offset);
-  }
-}
-
-void BindValuebufferCHROMIUM(GLenum target, GLuint valuebuffer) {
-  gles2::cmds::BindValuebufferCHROMIUM* c =
-      GetCmdSpace<gles2::cmds::BindValuebufferCHROMIUM>();
-  if (c) {
-    c->Init(target, valuebuffer);
-  }
-}
-
-void SubscribeValueCHROMIUM(GLenum target, GLenum subscription) {
-  gles2::cmds::SubscribeValueCHROMIUM* c =
-      GetCmdSpace<gles2::cmds::SubscribeValueCHROMIUM>();
-  if (c) {
-    c->Init(target, subscription);
-  }
-}
-
-void PopulateSubscribedValuesCHROMIUM(GLenum target) {
-  gles2::cmds::PopulateSubscribedValuesCHROMIUM* c =
-      GetCmdSpace<gles2::cmds::PopulateSubscribedValuesCHROMIUM>();
-  if (c) {
-    c->Init(target);
-  }
-}
-
-void UniformValuebufferCHROMIUM(GLint location,
-                                GLenum target,
-                                GLenum subscription) {
-  gles2::cmds::UniformValuebufferCHROMIUM* c =
-      GetCmdSpace<gles2::cmds::UniformValuebufferCHROMIUM>();
-  if (c) {
-    c->Init(location, target, subscription);
-  }
-}
-
 void BindTexImage2DCHROMIUM(GLenum target, GLint imageId) {
   gles2::cmds::BindTexImage2DCHROMIUM* c =
       GetCmdSpace<gles2::cmds::BindTexImage2DCHROMIUM>();