Add support for READ_BUFFER and SAMPLER_BINDING queries

BUG=angleproject:1101 TEST=dEQP-GLES3.functional.state_query.integers.* (all pass) Change-Id: I3a70335eeaef39822700ff639443a59849ed53fa Reviewed-on: https://chromium-review.googlesource.com/329866Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Add support for READ_BUFFER and SAMPLER_BINDING queries
86821db3 · Olli Etuaho · Commit Bot · 586bc55c · 86821db3 · 86821db3
Commit 86821db3 authored Mar 04, 2016 by Olli Etuaho Committed by Commit Bot Mar 07, 2016
Showing with 9 additions and 8 deletions

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

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

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

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -1459,6 +1459,8 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
      case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
      case GL_COPY_READ_BUFFER_BINDING:
      case GL_COPY_WRITE_BUFFER_BINDING:
+      case GL_SAMPLER_BINDING:
+      case GL_READ_BUFFER:
      case GL_TEXTURE_BINDING_3D:
      case GL_TEXTURE_BINDING_2D_ARRAY:
      case GL_MAX_3D_TEXTURE_SIZE:

--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -1606,6 +1606,13 @@ void State::getIntegerv(const gl::Data &data, GLenum pname, GLint *params)
      case GL_PIXEL_UNPACK_BUFFER_BINDING:
        *params = mUnpack.pixelBuffer.id();
        break;
+      case GL_READ_BUFFER:
+          *params = mReadFramebuffer->getReadBufferState();
+          break;
+      case GL_SAMPLER_BINDING:
+          ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
+          *params = getSamplerId(static_cast<GLuint>(mActiveSampler));
+          break;
      case GL_DEBUG_LOGGED_MESSAGES:
          *params = static_cast<GLint>(mDebug.getMessageCount());
          break;

--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -78,14 +78,6 @@
 1093 WIN LINUX : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_fragment.vec4 = FAIL
 1094 WIN LINUX : dEQP-GLES3.functional.shaders.builtin_variable.vertex_id = FAIL
 1101 WIN LINUX : dEQP-GLES3.functional.state_query.fbo.framebuffer_attachment_x_size_rbo = FAIL
-1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.sampler_binding_getboolean = FAIL
-1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.sampler_binding_getinteger = FAIL
-1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.sampler_binding_getinteger64 = FAIL
-1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.sampler_binding_getfloat = FAIL
-1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.read_buffer_getboolean = FAIL
-1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.read_buffer_getinteger = FAIL
-1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.read_buffer_getinteger64 = FAIL
-1101 WIN LINUX : dEQP-GLES3.functional.state_query.integers.read_buffer_getfloat = 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
 1095 WIN LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_mirror = FAIL