commit 45c785d35c270ca1d1168b6ca5517cb3a5a285cc
author Jamie Madill <jmadill@chromium.org> Tue May 13 14:09:34 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Fri May 16 15:06:49 2014 +0000
tree c7eae1e6f95c98711abb10fb5f660943f57f8152
parent db2f14c0b1133507215dd3b7a30155b70885973a

Move validation of EndQuery out of gl::Context.

BUG=angle:571

Change-Id: I8913eb1b565a4282d9d84d06933e8b854453f17d
Reviewed-on: https://chromium-review.googlesource.com/199349
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 855e6b3..0256df6 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -1823,9 +1823,9 @@
 
         if (context)
         {
-            if (!ValidQueryType(context, target))
+            if (!ValidateEndQuery(context, target))
             {
-                return gl::error(GL_INVALID_ENUM);
+                return;
             }
 
             context->endQuery(target);
@@ -3118,7 +3118,7 @@
             switch (pname)
             {
               case GL_CURRENT_QUERY_EXT:
-                params[0] = context->getActiveQuery(target);
+                params[0] = context->getActiveQueryId(target);
                 break;
 
               default:
@@ -3149,7 +3149,7 @@
                 return gl::error(GL_INVALID_OPERATION);
             }
 
-            if (context->getActiveQuery(queryObject->getType()) == id)
+            if (context->getActiveQueryId(queryObject->getType()) == id)
             {
                 return gl::error(GL_INVALID_OPERATION);
             }
@@ -6554,7 +6554,6 @@
             {
                 return;
             }
-
             context->beginQuery(target, id);
         }
     }
@@ -6579,9 +6578,9 @@
                 return gl::error(GL_INVALID_OPERATION);
             }
 
-            if (!ValidQueryType(context, target))
+            if (!ValidateEndQuery(context, target))
             {
-                return gl::error(GL_INVALID_ENUM);
+                return;
             }
 
             context->endQuery(target);
@@ -6616,7 +6615,7 @@
             switch (pname)
             {
               case GL_CURRENT_QUERY:
-                params[0] = context->getActiveQuery(target);
+                params[0] = static_cast<GLint>(context->getActiveQueryId(target));
                 break;
 
               default:
@@ -6652,7 +6651,7 @@
                 return gl::error(GL_INVALID_OPERATION);
             }
 
-            if (context->getActiveQuery(queryObject->getType()) == id)
+            if (context->getActiveQueryId(queryObject->getType()) == id)
             {
                 return gl::error(GL_INVALID_OPERATION);
             }