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/validationES.cpp

diff --git a/src/libGLESv2/validationES.cpp b/src/libGLESv2/validationES.cpp
index f59b2f5..34c56ec 100644
--- a/src/libGLESv2/validationES.cpp
+++ b/src/libGLESv2/validationES.cpp
@@ -924,4 +924,26 @@
     return true;
 }
 
+bool ValidateEndQuery(gl::Context *context, GLenum target)
+{
+    if (!ValidQueryType(context, target))
+    {
+        return gl::error(GL_INVALID_ENUM, false);
+    }
+
+    const Query *queryObject = context->getActiveQuery(target);
+
+    if (queryObject == NULL)
+    {
+        return gl::error(GL_INVALID_OPERATION, false);
+    }
+
+    if (!queryObject->isStarted())
+    {
+        return gl::error(GL_INVALID_OPERATION, false);
+    }
+
+    return true;
+}
+
 }