Add support for GL_EXT_occlusion_query_boolean

TEST=unit tests
BUG=88601


Review URL: http://codereview.chromium.org/9555011

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

2 files changed, 43 insertions, 7 deletions

diff --git a/ui/gfx/gl/generate_bindings.py b/ui/gfx/gl/generate_bindings.py
index 2a255c7..ed80602 100755
--- a/ui/gfx/gl/generate_bindings.py
+++ b/ui/gfx/gl/generate_bindings.py
@@ -18,7 +18,10 @@ GL_FUNCTIONS = [
   'names': ['glAttachShader'],
   'arguments': 'GLuint program, GLuint shader', },
 { 'return_type': 'void',
-  'names': ['glBeginQuery', 'glBeginQueryEXT', 'glBeginQueryARB'],
+  'names': ['glBeginQuery'],
+  'arguments': 'GLenum target, GLuint id', },
+{ 'return_type': 'void',
+  'names': ['glBeginQueryARB', 'glBeginQueryEXT'],
   'arguments': 'GLenum target, GLuint id', },
 { 'return_type': 'void',
   'names': ['glBindAttribLocation'],
@@ -134,7 +137,7 @@ GL_FUNCTIONS = [
   'names': ['glCullFace'],
   'arguments': 'GLenum mode', },
 { 'return_type': 'void',
-  'names': ['glDeleteBuffersARB', 'glDeleteBuffers', 'glDeleteQueriesEXT'],
+  'names': ['glDeleteBuffersARB', 'glDeleteBuffers'],
   'arguments': 'GLsizei n, const GLuint* buffers', },
 { 'return_type': 'void',
   'names': ['glDeleteFramebuffersEXT', 'glDeleteFramebuffers'],
@@ -146,6 +149,9 @@ GL_FUNCTIONS = [
   'names': ['glDeleteQueries'],
   'arguments': 'GLsizei n, const GLuint* ids', },
 { 'return_type': 'void',
+  'names': ['glDeleteQueriesARB', 'glDeleteQueriesEXT'],
+  'arguments': 'GLsizei n, const GLuint* ids', },
+{ 'return_type': 'void',
   'names': ['glDeleteRenderbuffersEXT', 'glDeleteRenderbuffers'],
   'arguments': 'GLsizei n, const GLuint* renderbuffers', },
 { 'return_type': 'void',
@@ -201,7 +207,10 @@ GL_FUNCTIONS = [
   'names': ['glEnableVertexAttribArray'],
   'arguments': 'GLuint index', },
 { 'return_type': 'void',
-  'names': ['glEndQuery', 'glEndQueryARB', 'glEndQueryEXT'],
+  'names': ['glEndQuery'],
+  'arguments': 'GLenum target', },
+{ 'return_type': 'void',
+  'names': ['glEndQueryARB', 'glEndQueryEXT'],
   'arguments': 'GLenum target', },
 { 'return_type': 'void',
   'names': ['glFinish'],
@@ -226,7 +235,10 @@ GL_FUNCTIONS = [
   'names': ['glGenBuffersARB', 'glGenBuffers'],
   'arguments': 'GLsizei n, GLuint* buffers', },
 { 'return_type': 'void',
-  'names': ['glGenQueries', 'glGenQueriesARB', 'glGenQueriesEXT'],
+  'names': ['glGenQueries'],
+  'arguments': 'GLsizei n, GLuint* ids', },
+{ 'return_type': 'void',
+  'names': ['glGenQueriesARB', 'glGenQueriesEXT'],
   'arguments': 'GLsizei n, GLuint* ids', },
 { 'return_type': 'void',
   'names': ['glGenerateMipmapEXT', 'glGenerateMipmap'],
@@ -291,7 +303,10 @@ GL_FUNCTIONS = [
   'arguments':
       'GLuint program, GLsizei bufsize, GLsizei* length, char* infolog', },
 { 'return_type': 'void',
-  'names': ['glGetQueryiv', 'glGetQueryivARB', 'glGetQueryivEXT'],
+  'names': ['glGetQueryiv'],
+  'arguments': 'GLenum target, GLenum pname, GLint* params', },
+{ 'return_type': 'void',
+  'names': ['glGetQueryivARB', 'glGetQueryivEXT'],
   'arguments': 'GLenum target, GLenum pname, GLint* params', },
 { 'return_type': 'void',
   'names': ['glGetQueryObjecti64v'],
@@ -303,8 +318,10 @@ GL_FUNCTIONS = [
   'names': ['glGetQueryObjectui64v'],
   'arguments': 'GLuint id, GLenum pname, GLuint64* params', },
 { 'return_type': 'void',
-  'names': ['glGetQueryObjectuiv', 'glGetQueryObjectuivARB',
-            'glGetQueryObjectuivEXT'],
+  'names': ['glGetQueryObjectuiv'],
+  'arguments': 'GLuint id, GLenum pname, GLuint* params', },
+{ 'return_type': 'void',
+  'names': ['glGetQueryObjectuivARB', 'glGetQueryObjectuivEXT'],
   'arguments': 'GLuint id, GLenum pname, GLuint* params', },
 { 'return_type': 'void',
   'names': ['glGetRenderbufferParameterivEXT', 'glGetRenderbufferParameteriv'],
@@ -377,6 +394,9 @@ GL_FUNCTIONS = [
   'names': ['glIsProgram'],
   'arguments': 'GLuint program', },
 { 'return_type': 'GLboolean',
+  'names': ['glIsQueryARB', 'glIsQueryEXT'],
+  'arguments': 'GLuint query', },
+{ 'return_type': 'GLboolean',
   'names': ['glIsRenderbufferEXT', 'glIsRenderbuffer'],
   'arguments': 'GLuint renderbuffer', },
 { 'return_type': 'GLboolean',
diff --git a/ui/gfx/gl/gl_interface.h b/ui/gfx/gl/gl_interface.h
index 684f9b3..e5f1b46 100644
--- a/ui/gfx/gl/gl_interface.h
+++ b/ui/gfx/gl/gl_interface.h
@@ -30,6 +30,8 @@ class GL_EXPORT GLInterface {
 
   virtual void BeginQuery(GLenum target, GLuint id) = 0;
 
+  virtual void BeginQueryARB(GLenum target, GLuint id) = 0;
+
   virtual void BindAttribLocation(GLuint program,
                                   GLuint index,
                                   const char* name) = 0;
@@ -156,6 +158,8 @@ class GL_EXPORT GLInterface {
 
   virtual void DeleteQueries(GLsizei n, const GLuint* ids) = 0;
 
+  virtual void DeleteQueriesARB(GLsizei n, const GLuint* ids) = 0;
+
   virtual void DeleteShader(GLuint shader) = 0;
 
   virtual void DeleteTextures(GLsizei n, const GLuint* textures) = 0;
@@ -197,6 +201,8 @@ class GL_EXPORT GLInterface {
 
   virtual void EndQuery(GLenum target) = 0;
 
+  virtual void EndQueryARB(GLenum target) = 0;
+
   virtual void Finish() = 0;
 
   virtual void Flush() = 0;
@@ -222,6 +228,8 @@ class GL_EXPORT GLInterface {
 
   virtual void GenQueries(GLsizei n, GLuint* ids) = 0;
 
+  virtual void GenQueriesARB(GLsizei n, GLuint* ids) = 0;
+
   virtual void GenRenderbuffersEXT(GLsizei n, GLuint* renderbuffers) = 0;
 
   virtual void GenTextures(GLsizei n, GLuint* textures) = 0;
@@ -276,6 +284,8 @@ class GL_EXPORT GLInterface {
 
   virtual void GetQueryiv(GLenum target, GLenum pname, GLint* params) = 0;
 
+  virtual void GetQueryivARB(GLenum target, GLenum pname, GLint* params) = 0;
+
   virtual void GetQueryObjecti64v(GLuint id, GLenum pname, GLint64* params) = 0;
 
   virtual void GetQueryObjectiv(GLuint id, GLenum pname, GLint* params) = 0;
@@ -286,6 +296,10 @@ class GL_EXPORT GLInterface {
 
   virtual void GetQueryObjectuiv(GLuint id, GLenum pname, GLuint* params) = 0;
 
+  virtual void GetQueryObjectuivARB(GLuint id,
+                                    GLenum pname,
+                                    GLuint* params) = 0;
+
   virtual void GetRenderbufferParameterivEXT(GLenum target,
                                              GLenum pname,
                                              GLint* params) = 0;
@@ -366,6 +380,8 @@ class GL_EXPORT GLInterface {
 
   virtual GLboolean IsProgram(GLuint program) = 0;
 
+  virtual GLboolean IsQueryARB(GLuint query) = 0;
+
   virtual GLboolean IsRenderbufferEXT(GLuint renderbuffer) = 0;
 
   virtual GLboolean IsShader(GLuint shader) = 0;