Implement primitive restart boolean query.

We have support for primitive restart in the GL renderer, but we didn't complete support for the state query. BUG=angleproject:1101 Change-Id: I4c6ad10642f7de1d09718c4582f1037782cced58 Reviewed-on: https://chromium-review.googlesource.com/309151 Tryjob-Request: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@google.com> Tested-by: Jamie Madill <jmadill@chromium.org>

Implement primitive restart boolean query.
e2cd53d6 · Jamie Madill · 362df97f · e2cd53d6 · e2cd53d6 · e2cd53d6
Commit e2cd53d6 authored Oct 27, 2015 by Jamie Madill
Showing with 4 additions and 4 deletions

Context.cpp src/libANGLE/Context.cpp +1 -0

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

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

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -1270,6 +1270,7 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu

      case GL_TRANSFORM_FEEDBACK_ACTIVE:
      case GL_TRANSFORM_FEEDBACK_PAUSED:
+      case GL_PRIMITIVE_RESTART_FIXED_INDEX:
        {
            *type = GL_BOOL;
            *numParams = 1;

--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -1265,6 +1265,9 @@ void State::getBooleanv(GLenum pname, GLboolean *params)
      case GL_DITHER:                    *params = mBlend.dither;                 break;
      case GL_TRANSFORM_FEEDBACK_ACTIVE: *params = getCurrentTransformFeedback()->isActive() ? GL_TRUE : GL_FALSE; break;
      case GL_TRANSFORM_FEEDBACK_PAUSED: *params = getCurrentTransformFeedback()->isPaused() ? GL_TRUE : GL_FALSE; break;
+      case GL_PRIMITIVE_RESTART_FIXED_INDEX:
+          *params = mPrimitiveRestart;
+          break;
      default:
        UNREACHABLE();
        break;

--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -1099,10 +1099,6 @@
 1101 WIN : dEQP-GLES3.functional.read_pixels.skip.choose_3_0 = FAIL
 1101 WIN : dEQP-GLES3.functional.read_pixels.skip.choose_3_3 = FAIL
 1101 WIN : dEQP-GLES3.functional.read_pixels.skip.choose_3_5 = FAIL
-1101 WIN : dEQP-GLES3.functional.state_query.boolean.primitive_restart_fixed_index_getboolean = FAIL
-1101 WIN : dEQP-GLES3.functional.state_query.boolean.primitive_restart_fixed_index_getinteger = FAIL
-1101 WIN : dEQP-GLES3.functional.state_query.boolean.primitive_restart_fixed_index_getinteger64 = FAIL
-1101 WIN : dEQP-GLES3.functional.state_query.boolean.primitive_restart_fixed_index_getfloat = FAIL
 1101 WIN : dEQP-GLES3.functional.state_query.boolean.rasterizer_discard_getboolean = FAIL
 1101 WIN : dEQP-GLES3.functional.state_query.boolean.rasterizer_discard_getinteger = FAIL
 1101 WIN : dEQP-GLES3.functional.state_query.boolean.rasterizer_discard_getinteger64 = FAIL