Allow multiple query types simultaneously

While GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT and GL_ANY_SAMPLES_PASSED_EXT are mutually exclusive, they can be used simultaneously with the GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN query. Change-Id: I818cf548c724ef56640b795530c3437e4dbcba98 Reviewed-on: https://swiftshader-review.googlesource.com/13828Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Allow multiple query types simultaneously
94ca5b63 · Alexis Hetu · Alexis Hétu · 6e86449e · 94ca5b63
Commit 94ca5b63 authored Nov 14, 2017 by Alexis Hetu Committed by Alexis Hétu Nov 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 1 deletion

Context.cpp src/OpenGL/libGLESv2/Context.cpp +19 -1

No files found.
--- a/src/OpenGL/libGLESv2/Context.cpp
+++ b/src/OpenGL/libGLESv2/Context.cpp
@@ -1357,7 +1357,25 @@ void Context::beginQuery(GLenum target, GLuint query)
 	{
 		if(mState.activeQuery[i])
 		{
-			return error(GL_INVALID_OPERATION);
+			switch(mState.activeQuery[i]->getType())
+			{
+			case GL_ANY_SAMPLES_PASSED_EXT:
+			case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT:
+				if((target == GL_ANY_SAMPLES_PASSED_EXT) ||
+				   (target == GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT))
+				{
+					return error(GL_INVALID_OPERATION);
+				}
+				break;
+			case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
+				if(target == GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN)
+				{
+					return error(GL_INVALID_OPERATION);
+				}
+				break;
+			default:
+				break;
+			}
 		}
 	}