Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

ui/gl/gl_bindings_autogen_gl.cc

 // Copyright 2014 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.
 //
 // This file is auto-generated from
 // ui/gl/generate_bindings.py
 // It's formatted by clang-format using chromium coding style:
 //    clang-format -i -style=chromium filename
 // DO NOT EDIT!
 
@@ skipping 194 matching lines @@
   fn.glGetInteger64vFn = 0;
   fn.glGetIntegeri_vFn = 0;
   fn.glGetIntegervFn =
       reinterpret_cast<glGetIntegervProc>(GetGLProcAddress("glGetIntegerv"));
   fn.glGetInternalformativFn = 0;
   fn.glGetProgramBinaryFn = 0;
   fn.glGetProgramInfoLogFn = reinterpret_cast<glGetProgramInfoLogProc>(
       GetGLProcAddress("glGetProgramInfoLog"));
   fn.glGetProgramivFn =
       reinterpret_cast<glGetProgramivProc>(GetGLProcAddress("glGetProgramiv"));
-  fn.glGetProgramResourceLocationFn = 0;
   fn.glGetQueryivFn = 0;
   fn.glGetQueryivARBFn = 0;
   fn.glGetQueryObjecti64vFn = 0;
   fn.glGetQueryObjectivFn = 0;
   fn.glGetQueryObjectivARBFn = 0;
   fn.glGetQueryObjectui64vFn = 0;
   fn.glGetQueryObjectuivFn = 0;
   fn.glGetQueryObjectuivARBFn = 0;
   fn.glGetRenderbufferParameterivEXTFn = 0;
   fn.glGetSamplerParameterfvFn = 0;
   fn.glGetSamplerParameterivFn = 0;
   fn.glGetShaderInfoLogFn = reinterpret_cast<glGetShaderInfoLogProc>(
       GetGLProcAddress("glGetShaderInfoLog"));
   fn.glGetShaderivFn =
       reinterpret_cast<glGetShaderivProc>(GetGLProcAddress("glGetShaderiv"));
   fn.glGetShaderPrecisionFormatFn = 0;
   fn.glGetShaderSourceFn = reinterpret_cast<glGetShaderSourceProc>(
       GetGLProcAddress("glGetShaderSource"));
   fn.glGetStringFn =
       reinterpret_cast<glGetStringProc>(GetGLProcAddress("glGetString"));
-  fn.glGetStringiFn = 0;
   fn.glGetSyncivFn = 0;
   fn.glGetTexLevelParameterfvFn = 0;
   fn.glGetTexLevelParameterivFn = 0;
   fn.glGetTexParameterfvFn = reinterpret_cast<glGetTexParameterfvProc>(
       GetGLProcAddress("glGetTexParameterfv"));
   fn.glGetTexParameterivFn = reinterpret_cast<glGetTexParameterivProc>(
       GetGLProcAddress("glGetTexParameteriv"));
   fn.glGetTransformFeedbackVaryingFn = 0;
   fn.glGetTranslatedShaderSourceANGLEFn = 0;
   fn.glGetUniformBlockIndexFn = 0;
@@ skipping 1020 matching lines @@
       ext.b_GL_ARB_get_program_binary) {
     fn.glGetProgramBinaryFn = reinterpret_cast<glGetProgramBinaryProc>(
         GetGLProcAddress("glGetProgramBinary"));
     DCHECK(fn.glGetProgramBinaryFn);
   } else if (ext.b_GL_OES_get_program_binary) {
     fn.glGetProgramBinaryFn = reinterpret_cast<glGetProgramBinaryProc>(
         GetGLProcAddress("glGetProgramBinaryOES"));
     DCHECK(fn.glGetProgramBinaryFn);
   }
 
-  debug_fn.glGetProgramResourceLocationFn = 0;
-  if (ver->IsAtLeastGL(4u, 3u) || ver->IsAtLeastGLES(3u, 1u)) {
-    fn.glGetProgramResourceLocationFn =
-        reinterpret_cast<glGetProgramResourceLocationProc>(
-            GetGLProcAddress("glGetProgramResourceLocation"));
-    DCHECK(fn.glGetProgramResourceLocationFn);
-  }
-
   debug_fn.glGetQueryivFn = 0;
   if (!ver->is_es || ver->IsAtLeastGLES(3u, 0u)) {
     fn.glGetQueryivFn =
         reinterpret_cast<glGetQueryivProc>(GetGLProcAddress("glGetQueryiv"));
     DCHECK(fn.glGetQueryivFn);
   }
 
   debug_fn.glGetQueryivARBFn = 0;
   if (ext.b_GL_ARB_occlusion_query) {
     fn.glGetQueryivARBFn = reinterpret_cast<glGetQueryivARBProc>(
@@ skipping 95 matching lines @@
   }
 
   debug_fn.glGetShaderPrecisionFormatFn = 0;
   if (ver->IsAtLeastGL(4u, 1u) || ver->is_es) {
     fn.glGetShaderPrecisionFormatFn =
         reinterpret_cast<glGetShaderPrecisionFormatProc>(
             GetGLProcAddress("glGetShaderPrecisionFormat"));
     DCHECK(fn.glGetShaderPrecisionFormatFn);
   }
 
-  debug_fn.glGetStringiFn = 0;
-  if (ver->IsAtLeastGL(3u, 0u) || ver->IsAtLeastGLES(3u, 0u)) {
-    fn.glGetStringiFn =
-        reinterpret_cast<glGetStringiProc>(GetGLProcAddress("glGetStringi"));
-    DCHECK(fn.glGetStringiFn);
-  }
-
   debug_fn.glGetSyncivFn = 0;
   if (ver->IsAtLeastGL(3u, 2u) || ver->IsAtLeastGLES(3u, 0u) ||
       ext.b_GL_ARB_sync) {
     fn.glGetSyncivFn =
         reinterpret_cast<glGetSyncivProc>(GetGLProcAddress("glGetSynciv"));
     DCHECK(fn.glGetSyncivFn);
   }
 
   debug_fn.glGetTexLevelParameterfvFn = 0;
   if (!ver->is_es || ver->IsAtLeastGLES(3u, 1u)) {
@@ skipping 1839 matching lines @@
 }
 
 static void GL_BINDING_CALL
 Debug_glGetProgramiv(GLuint program, GLenum pname, GLint* params) {
   GL_SERVICE_LOG("glGetProgramiv"
                  << "(" << program << ", " << GLEnums::GetStringEnum(pname)
                  << ", " << static_cast<const void*>(params) << ")");
   g_driver_gl.debug_fn.glGetProgramivFn(program, pname, params);
 }
 
-static GLint GL_BINDING_CALL
-Debug_glGetProgramResourceLocation(GLuint program,
-                                   GLenum programInterface,
-                                   const char* name) {
-  GL_SERVICE_LOG("glGetProgramResourceLocation"
-                 << "(" << program << ", "
-                 << GLEnums::GetStringEnum(programInterface) << ", " << name
-                 << ")");
-  GLint result = g_driver_gl.debug_fn.glGetProgramResourceLocationFn(
-      program, programInterface, name);
-  GL_SERVICE_LOG("GL_RESULT: " << result);
-  return result;
-}
-
 static void GL_BINDING_CALL
 Debug_glGetQueryiv(GLenum target, GLenum pname, GLint* params) {
   GL_SERVICE_LOG("glGetQueryiv"
                  << "(" << GLEnums::GetStringEnum(target) << ", "
                  << GLEnums::GetStringEnum(pname) << ", "
                  << static_cast<const void*>(params) << ")");
   g_driver_gl.debug_fn.glGetQueryivFn(target, pname, params);
 }
 
 static void GL_BINDING_CALL
@@ skipping 125 matching lines @@
 }
 
 static const GLubyte* GL_BINDING_CALL Debug_glGetString(GLenum name) {
   GL_SERVICE_LOG("glGetString"
                  << "(" << GLEnums::GetStringEnum(name) << ")");
   const GLubyte* result = g_driver_gl.debug_fn.glGetStringFn(name);
   GL_SERVICE_LOG("GL_RESULT: " << result);
   return result;
 }
 
-static const GLubyte* GL_BINDING_CALL
-Debug_glGetStringi(GLenum name, GLuint index) {
-  GL_SERVICE_LOG("glGetStringi"
-                 << "(" << GLEnums::GetStringEnum(name) << ", " << index
-                 << ")");
-  const GLubyte* result = g_driver_gl.debug_fn.glGetStringiFn(name, index);
-  GL_SERVICE_LOG("GL_RESULT: " << result);
-  return result;
-}
-
 static void GL_BINDING_CALL Debug_glGetSynciv(GLsync sync,
                                               GLenum pname,
                                               GLsizei bufSize,
                                               GLsizei* length,
                                               GLint* values) {
   GL_SERVICE_LOG("glGetSynciv"
                  << "(" << sync << ", " << GLEnums::GetStringEnum(pname) << ", "
                  << bufSize << ", " << static_cast<const void*>(length) << ", "
                  << static_cast<const void*>(values) << ")");
   g_driver_gl.debug_fn.glGetSyncivFn(sync, pname, bufSize, length, values);
@@ skipping 1832 matching lines @@
     fn.glGetProgramBinaryFn = Debug_glGetProgramBinary;
   }
   if (!debug_fn.glGetProgramInfoLogFn) {
     debug_fn.glGetProgramInfoLogFn = fn.glGetProgramInfoLogFn;
     fn.glGetProgramInfoLogFn = Debug_glGetProgramInfoLog;
   }
   if (!debug_fn.glGetProgramivFn) {
     debug_fn.glGetProgramivFn = fn.glGetProgramivFn;
     fn.glGetProgramivFn = Debug_glGetProgramiv;
   }
-  if (!debug_fn.glGetProgramResourceLocationFn) {
-    debug_fn.glGetProgramResourceLocationFn = fn.glGetProgramResourceLocationFn;
-    fn.glGetProgramResourceLocationFn = Debug_glGetProgramResourceLocation;
-  }
   if (!debug_fn.glGetQueryivFn) {
     debug_fn.glGetQueryivFn = fn.glGetQueryivFn;
     fn.glGetQueryivFn = Debug_glGetQueryiv;
   }
   if (!debug_fn.glGetQueryivARBFn) {
     debug_fn.glGetQueryivARBFn = fn.glGetQueryivARBFn;
     fn.glGetQueryivARBFn = Debug_glGetQueryivARB;
   }
   if (!debug_fn.glGetQueryObjecti64vFn) {
     debug_fn.glGetQueryObjecti64vFn = fn.glGetQueryObjecti64vFn;
@@ skipping 46 matching lines @@
     fn.glGetShaderPrecisionFormatFn = Debug_glGetShaderPrecisionFormat;
   }
   if (!debug_fn.glGetShaderSourceFn) {
     debug_fn.glGetShaderSourceFn = fn.glGetShaderSourceFn;
     fn.glGetShaderSourceFn = Debug_glGetShaderSource;
   }
   if (!debug_fn.glGetStringFn) {
     debug_fn.glGetStringFn = fn.glGetStringFn;
     fn.glGetStringFn = Debug_glGetString;
   }
-  if (!debug_fn.glGetStringiFn) {
-    debug_fn.glGetStringiFn = fn.glGetStringiFn;
-    fn.glGetStringiFn = Debug_glGetStringi;
-  }
   if (!debug_fn.glGetSyncivFn) {
     debug_fn.glGetSyncivFn = fn.glGetSyncivFn;
     fn.glGetSyncivFn = Debug_glGetSynciv;
   }
   if (!debug_fn.glGetTexLevelParameterfvFn) {
     debug_fn.glGetTexLevelParameterfvFn = fn.glGetTexLevelParameterfvFn;
     fn.glGetTexLevelParameterfvFn = Debug_glGetTexLevelParameterfv;
   }
   if (!debug_fn.glGetTexLevelParameterivFn) {
     debug_fn.glGetTexLevelParameterivFn = fn.glGetTexLevelParameterivFn;
@@ skipping 1323 matching lines @@
                                       GLsizei bufsize,
                                       GLsizei* length,
                                       char* infolog) {
   driver_->fn.glGetProgramInfoLogFn(program, bufsize, length, infolog);
 }
 
 void GLApiBase::glGetProgramivFn(GLuint program, GLenum pname, GLint* params) {
   driver_->fn.glGetProgramivFn(program, pname, params);
 }
 
-GLint GLApiBase::glGetProgramResourceLocationFn(GLuint program,
-                                                GLenum programInterface,
-                                                const char* name) {
-  return driver_->fn.glGetProgramResourceLocationFn(program, programInterface,
-                                                    name);
-}
-
 void GLApiBase::glGetQueryivFn(GLenum target, GLenum pname, GLint* params) {
   driver_->fn.glGetQueryivFn(target, pname, params);
 }
 
 void GLApiBase::glGetQueryivARBFn(GLenum target, GLenum pname, GLint* params) {
   driver_->fn.glGetQueryivARBFn(target, pname, params);
 }
 
 void GLApiBase::glGetQueryObjecti64vFn(GLuint id,
                                        GLenum pname,
@@ skipping 68 matching lines @@
                                     GLsizei bufsize,
                                     GLsizei* length,
                                     char* source) {
   driver_->fn.glGetShaderSourceFn(shader, bufsize, length, source);
 }
 
 const GLubyte* GLApiBase::glGetStringFn(GLenum name) {
   return driver_->fn.glGetStringFn(name);
 }
 
-const GLubyte* GLApiBase::glGetStringiFn(GLenum name, GLuint index) {
-  return driver_->fn.glGetStringiFn(name, index);
-}
-
 void GLApiBase::glGetSyncivFn(GLsync sync,
                               GLenum pname,
                               GLsizei bufSize,
                               GLsizei* length,
                               GLint* values) {
   driver_->fn.glGetSyncivFn(sync, pname, bufSize, length, values);
 }
 
 void GLApiBase::glGetTexLevelParameterfvFn(GLenum target,
                                            GLint level,
@@ skipping 1692 matching lines @@
                                        char* infolog) {
   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGetProgramInfoLog")
   gl_api_->glGetProgramInfoLogFn(program, bufsize, length, infolog);
 }
 
 void TraceGLApi::glGetProgramivFn(GLuint program, GLenum pname, GLint* params) {
   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGetProgramiv")
   gl_api_->glGetProgramivFn(program, pname, params);
 }
 
-GLint TraceGLApi::glGetProgramResourceLocationFn(GLuint program,
-                                                 GLenum programInterface,
-                                                 const char* name) {
-  TRACE_EVENT_BINARY_EFFICIENT0("gpu",
-                                "TraceGLAPI::glGetProgramResourceLocation")
-  return gl_api_->glGetProgramResourceLocationFn(program, programInterface,
-                                                 name);
-}
-
 void TraceGLApi::glGetQueryivFn(GLenum target, GLenum pname, GLint* params) {
   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGetQueryiv")
   gl_api_->glGetQueryivFn(target, pname, params);
 }
 
 void TraceGLApi::glGetQueryivARBFn(GLenum target, GLenum pname, GLint* params) {
   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGetQueryivARB")
   gl_api_->glGetQueryivARBFn(target, pname, params);
 }
 
@@ skipping 87 matching lines @@
                                      char* source) {
   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGetShaderSource")
   gl_api_->glGetShaderSourceFn(shader, bufsize, length, source);
 }
 
 const GLubyte* TraceGLApi::glGetStringFn(GLenum name) {
   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGetString")
   return gl_api_->glGetStringFn(name);
 }
 
-const GLubyte* TraceGLApi::glGetStringiFn(GLenum name, GLuint index) {
-  TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGetStringi")
-  return gl_api_->glGetStringiFn(name, index);
-}
-
 void TraceGLApi::glGetSyncivFn(GLsync sync,
                                GLenum pname,
                                GLsizei bufSize,
                                GLsizei* length,
                                GLint* values) {
   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGetSynciv")
   gl_api_->glGetSyncivFn(sync, pname, bufSize, length, values);
 }
 
 void TraceGLApi::glGetTexLevelParameterfvFn(GLenum target,
@@ skipping 1960 matching lines @@
       << "Trying to call glGetProgramInfoLog() without current GL context";
 }
 
 void NoContextGLApi::glGetProgramivFn(GLuint program,
                                       GLenum pname,
                                       GLint* params) {
   NOTREACHED() << "Trying to call glGetProgramiv() without current GL context";
   LOG(ERROR) << "Trying to call glGetProgramiv() without current GL context";
 }
 
-GLint NoContextGLApi::glGetProgramResourceLocationFn(GLuint program,
-                                                     GLenum programInterface,
-                                                     const char* name) {
-  NOTREACHED() << "Trying to call glGetProgramResourceLocation() without "
-                  "current GL context";
-  LOG(ERROR) << "Trying to call glGetProgramResourceLocation() without current "
-                "GL context";
-  return 0;
-}
-
 void NoContextGLApi::glGetQueryivFn(GLenum target,
                                     GLenum pname,
                                     GLint* params) {
   NOTREACHED() << "Trying to call glGetQueryiv() without current GL context";
   LOG(ERROR) << "Trying to call glGetQueryiv() without current GL context";
 }
 
 void NoContextGLApi::glGetQueryivARBFn(GLenum target,
                                        GLenum pname,
                                        GLint* params) {
@@ skipping 117 matching lines @@
       << "Trying to call glGetShaderSource() without current GL context";
   LOG(ERROR) << "Trying to call glGetShaderSource() without current GL context";
 }
 
 const GLubyte* NoContextGLApi::glGetStringFn(GLenum name) {
   NOTREACHED() << "Trying to call glGetString() without current GL context";
   LOG(ERROR) << "Trying to call glGetString() without current GL context";
   return NULL;
 }
 
-const GLubyte* NoContextGLApi::glGetStringiFn(GLenum name, GLuint index) {
-  NOTREACHED() << "Trying to call glGetStringi() without current GL context";
-  LOG(ERROR) << "Trying to call glGetStringi() without current GL context";
-  return NULL;
-}
-
 void NoContextGLApi::glGetSyncivFn(GLsync sync,
                                    GLenum pname,
                                    GLsizei bufSize,
                                    GLsizei* length,
                                    GLint* values) {
   NOTREACHED() << "Trying to call glGetSynciv() without current GL context";
   LOG(ERROR) << "Trying to call glGetSynciv() without current GL context";
 }
 
 void NoContextGLApi::glGetTexLevelParameterfvFn(GLenum target,
@@ skipping 1085 matching lines @@
 
 GLenum NoContextGLApi::glWaitSyncFn(GLsync sync,
                                     GLbitfield flags,
                                     GLuint64 timeout) {
   NOTREACHED() << "Trying to call glWaitSync() without current GL context";
   LOG(ERROR) << "Trying to call glWaitSync() without current GL context";
   return static_cast<GLenum>(0);
 }
 
 }  // namespace gfx