Add hooks for GL_EXT_debug_markers for Skia

BUG=

Review URL: https://codereview.chromium.org/197393002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256911 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 27 insertions, 0 deletions

diff --git a/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc b/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
index 64b0ee4..9803816 100644
--- a/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
+++ b/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
@@ -70,9 +70,12 @@ GrGLInterface* CreateCommandBufferSkiaGLBinding() {
   functions->fGetShaderiv = glGetShaderiv;
   functions->fGetString = glGetString;
   functions->fGetUniformLocation = glGetUniformLocation;
+  functions->fInsertEventMarker = glInsertEventMarkerEXT;
   functions->fLineWidth = glLineWidth;
   functions->fLinkProgram = glLinkProgram;
   functions->fPixelStorei = glPixelStorei;
+  functions->fPopGroupMarker = glPopGroupMarkerEXT;
+  functions->fPushGroupMarker = glPushGroupMarkerEXT;
   functions->fReadPixels = glReadPixels;
   functions->fScissor = glScissor;
   functions->fShaderSource = glShaderSource;
diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
index c8d0bbd..a7a4b4c 100755
--- a/ui/gl/generate_bindings.py
+++ b/ui/gl/generate_bindings.py
@@ -426,6 +426,9 @@ GL_FUNCTIONS = [
 { 'return_type': 'void',
   'names': ['glHint'],
   'arguments': 'GLenum target, GLenum mode', },
+{ 'return_type': 'void',
+  'names': ['glInsertEventMarkerEXT'],
+  'arguments': 'GLsizei length, const char* marker', },
 { 'return_type': 'GLboolean',
   'names': ['glIsBuffer'],
   'arguments': 'GLuint buffer', },
@@ -477,6 +480,9 @@ GL_FUNCTIONS = [
   'names': ['glPolygonOffset'],
   'arguments': 'GLfloat factor, GLfloat units', },
 { 'return_type': 'void',
+  'names': ['glPopGroupMarkerEXT'],
+  'arguments': 'void', },
+{ 'return_type': 'void',
   'known_as': 'glProgramBinary',
   'versions': [{ 'name': 'glProgramBinaryOES' },
                { 'name': 'glProgramBinary',
@@ -490,6 +496,9 @@ GL_FUNCTIONS = [
                { 'name': 'glProgramParameteri' }],
   'arguments': 'GLuint program, GLenum pname, GLint value' },
 { 'return_type': 'void',
+  'names': ['glPushGroupMarkerEXT'],
+  'arguments': 'GLsizei length, const char* marker', },
+{ 'return_type': 'void',
   'names': ['glQueryCounter'],
   'arguments': 'GLuint id, GLenum target', },
 { 'return_type': 'void',
diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
index 38e0f16..28da2c7 100644
--- a/ui/gl/gl_bindings_skia_in_process.cc
+++ b/ui/gl/gl_bindings_skia_in_process.cc
@@ -346,6 +346,10 @@ GLint StubGLGetUniformLocation(GLuint program, const char* name) {
   return glGetUniformLocation(program, name);
 }
 
+GLvoid StubGLInsertEventMarker(GLsizei length, const char* marker) {
+  glInsertEventMarkerEXT(length, marker);
+}
+
 GLvoid StubGLLineWidth(GLfloat width) {
   glLineWidth(width);
 }
@@ -362,6 +366,14 @@ GLvoid StubGLPixelStorei(GLenum pname, GLint param) {
   glPixelStorei(pname, param);
 }
 
+GLvoid StubGLPopGroupMarker() {
+  glPopGroupMarkerEXT();
+}
+
+GLvoid StubGLPushGroupMarker(GLsizei length, const char* marker) {
+  glPushGroupMarkerEXT(length, marker);
+}
+
 GLvoid StubGLQueryCounter(GLuint id, GLenum target) {
   glQueryCounter(id, target);
 }
@@ -648,9 +660,12 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
   functions->fGetString = StubGLGetString;
   functions->fGetTexLevelParameteriv = StubGLGetTexLevelParameteriv;
   functions->fGetUniformLocation = StubGLGetUniformLocation;
+  functions->fInsertEventMarker = StubGLInsertEventMarker;
   functions->fLineWidth = StubGLLineWidth;
   functions->fLinkProgram = StubGLLinkProgram;
   functions->fPixelStorei = StubGLPixelStorei;
+  functions->fPopGroupMarker = StubGLPopGroupMarker;
+  functions->fPushGroupMarker = StubGLPushGroupMarker;
   functions->fQueryCounter = StubGLQueryCounter;
   functions->fReadBuffer = StubGLReadBuffer;
   functions->fReadPixels = StubGLReadPixels;