Add queries for GL_RASTERIZER_DISCARD.

BUG=angleproject:1238 Change-Id: Id3b219dfcc758cf19d61b7dc7eeabd8c2159d212 Reviewed-on: https://chromium-review.googlesource.com/315100Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Add queries for GL_RASTERIZER_DISCARD.
ab831f04 · Geoff Lang · 2302e69a · ab831f04 · ab831f04 · ab831f04
Commit ab831f04 authored Dec 01, 2015 by Geoff Lang
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
@@ -1271,6 +1271,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:
+      case GL_RASTERIZER_DISCARD:
        {
            *type = GL_BOOL;
            *numParams = 1;

--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -1286,6 +1286,9 @@ void State::getBooleanv(GLenum pname, GLboolean *params)
      case GL_PRIMITIVE_RESTART_FIXED_INDEX:
          *params = mPrimitiveRestart;
          break;
+      case GL_RASTERIZER_DISCARD:
+          *params = isRasterizerDiscardEnabled() ? GL_TRUE : GL_FALSE;
+          break;
      default:
        UNREACHABLE();
        break;

--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -755,10 +755,6 @@
 1101 WIN : dEQP-GLES3.functional.negative_api.state.get_framebuffer_attachment_parameteriv = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.state.is_transform_feedback = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.state.is_vertex_array = 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
-1101 WIN : dEQP-GLES3.functional.state_query.boolean.rasterizer_discard_getfloat = FAIL
 1101 WIN : dEQP-GLES3.functional.state_query.integers.uniform_buffer_binding_getboolean = FAIL
 1101 WIN : dEQP-GLES3.functional.state_query.integers.uniform_buffer_binding_getinteger = FAIL
 1101 WIN : dEQP-GLES3.functional.state_query.integers.uniform_buffer_binding_getinteger64 = FAIL