Fix BeginQuery validation

ANY_SAMPLES_PASSED and ANY_SAMPLES_PASSED_CONSERVATIVE queries can not be active at the same time. The only place where the State::isQueryActive function is used is validating whether a BeginQuery call is correct, so it can be changed to check for this. BUG=angleproject:1101 TEST=dEQP-GLES3.functional.negative_api.fragment.begin_query Change-Id: Idadf129c6a036570f6e28857bdb24ffc11eeebe8 Reviewed-on: https://chromium-review.googlesource.com/356363Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Fix BeginQuery validation
bbf1c102 · Olli Etuaho · Commit Bot · 3c754194 · bbf1c102 · bbf1c102
Commit bbf1c102 authored Jun 28, 2016 by Olli Etuaho Committed by Commit Bot Jun 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 5 deletions

State.cpp src/libANGLE/State.cpp +13 -3

State.h src/libANGLE/State.h +1 -1

deqp_gles3_test_expectations.txt src/tests/deqp_support/deqp_gles3_test_expectations.txt +0 -1

No files found.
--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -23,6 +23,16 @@
 #include "libANGLE/VertexArray.h"
 #include "libANGLE/formatutils.h"
+namespace
+{
+GLenum ActiveQueryType(const GLenum type)
+{
+    return (type == GL_ANY_SAMPLES_PASSED_CONSERVATIVE) ? GL_ANY_SAMPLES_PASSED : type;
+}
+}  // anonymous namepace
 namespace gl
 {
@@ -1026,12 +1036,12 @@ bool State::removeTransformFeedbackBinding(GLuint transformFeedback)
    return false;
 }
-bool State::isQueryActive(GLenum type) const
+bool State::isQueryActive(const GLenum type) const
 {
    for (auto &iter : mActiveQueries)
    {
-        Query *query = iter.second.get();
+        const Query *query = iter.second.get();
-        if (query != nullptr && query->getType() == type)
+        if (query != nullptr && ActiveQueryType(query->getType()) == ActiveQueryType(type))
        {
            return true;
        }

--- a/src/libANGLE/State.h
+++ b/src/libANGLE/State.h
@@ -198,7 +198,7 @@ class State : angle::NonCopyable
    bool removeTransformFeedbackBinding(GLuint transformFeedback);
    // Query binding manipulation
-    bool isQueryActive(GLenum type) const;
+    bool isQueryActive(const GLenum type) const;
    bool isQueryActive(Query *query) const;
    void setActiveQuery(GLenum target, Query *query);
    GLuint getActiveQueryId(GLenum target) const;

--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -53,7 +53,6 @@
 1101 WIN LINUX : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage2d_invalid_size = FAIL
 1101 WIN LINUX : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage3d = FAIL
 1101 WIN LINUX : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage3d_invalid_buffer_target = FAIL
-1101 WIN LINUX : dEQP-GLES3.functional.negative_api.fragment.begin_query = FAIL
 1101 WIN LINUX : dEQP-GLES3.functional.negative_api.vertex_array.vertex_attrib_i_pointer = FAIL
 1095 WIN LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_clamp = FAIL
 1095 WIN LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_repeat = FAIL