mesa: Return number of result bits for GL_ANY_SAMPLES_PASSED_CONSERVATIVE

[mesa.git] / src / mesa / main / queryobj.c

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 46535d7b4c856700979ce7a0b126af106ab97639..7547fa1bb4d9a97720b2a78316f75436c10b0c21 100644 (file)
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -31,7 +31,6 @@
 #include "imports.h"
 #include "queryobj.h"
 #include "mtypes.h"
-#include "main/dispatch.h"
 
 
 /**
@@ -165,6 +164,20 @@ get_pipe_stats_binding_point(struct gl_context *ctx,
 static struct gl_query_object **
 get_query_binding_point(struct gl_context *ctx, GLenum target, GLuint index)
 {
+
+   /* From GL_EXT_occlusion_query_boolean spec:
+    *
+    *    "Accepted by the <target> parameter of BeginQueryEXT, EndQueryEXT,
+    *    and GetQueryivEXT:
+    *
+    *   ANY_SAMPLES_PASSED_EXT                         0x8C2F
+    *   ANY_SAMPLES_PASSED_CONSERVATIVE_EXT            0x8D6A"
+    */
+   if ((_mesa_is_gles(ctx) && ctx->Version == 20) &&
+       (target != GL_ANY_SAMPLES_PASSED &&
+        target != GL_ANY_SAMPLES_PASSED_CONSERVATIVE))
+      return NULL;
+
    switch (target) {
    case GL_SAMPLES_PASSED_ARB:
       if (ctx->Extensions.ARB_occlusion_query)
@@ -649,6 +662,19 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
    if (!query_error_check_index(ctx, target, index))
       return;
 
+   /* From the GL_EXT_occlusion_query_boolean spec:
+    *
+    * "The error INVALID_ENUM is generated if GetQueryivEXT is called where
+    * <pname> is not CURRENT_QUERY_EXT."
+    *
+    * Same rule is present also in ES 3.2 spec.
+    */
+   if (_mesa_is_gles(ctx) && pname != GL_CURRENT_QUERY) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivEXT(%s)",
+                  _mesa_enum_to_string(pname));
+      return;
+   }
+
    if (target == GL_TIMESTAMP) {
       if (!ctx->Extensions.ARB_timer_query) {
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryARB(target)");
@@ -672,6 +698,7 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
             *params = ctx->Const.QueryCounterBits.SamplesPassed;
             break;
          case GL_ANY_SAMPLES_PASSED:
+         case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
             /* The minimum value of this is 1 if it's nonzero, and the value
              * is only ever GL_TRUE or GL_FALSE, so no sense in reporting more
              * bits.
@@ -775,10 +802,28 @@ get_query_object(struct gl_context *ctx, const char *func,
       return;
    }
 
+   /* From GL_EXT_occlusion_query_boolean spec:
+    *
+    *    "Accepted by the <pname> parameter of GetQueryObjectivEXT and
+    *    GetQueryObjectuivEXT:
+    *
+    *    QUERY_RESULT_EXT                               0x8866
+    *    QUERY_RESULT_AVAILABLE_EXT                     0x8867"
+    *
+    * Same rule is present also in ES 3.2 spec.
+    */
+   if (_mesa_is_gles(ctx) &&
+       (pname != GL_QUERY_RESULT && pname != GL_QUERY_RESULT_AVAILABLE)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(%s)", func,
+                  _mesa_enum_to_string(pname));
+      return;
+   }
+
    if (buf && buf != ctx->Shared->NullBufferObj) {
       bool is_64bit = ptype == GL_INT64_ARB ||
          ptype == GL_UNSIGNED_INT64_ARB;
-      if (!ctx->Extensions.ARB_query_buffer_object) {
+      if (!ctx->Extensions.ARB_query_buffer_object &&
+          !ctx->Extensions.EXT_disjoint_timer_query) {
          _mesa_error(ctx, GL_INVALID_OPERATION, "%s(not supported)", func);
          return;
       }