Hi Marek;

On 08/09/2018 02:55 AM, Marek Olšák wrote:
From: Marek Olšák <marek.ol...@amd.com>

---
  src/mesa/main/queryobj.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 7547fa1bb4d..e97a0138e96 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -815,22 +815,21 @@ get_query_object(struct gl_context *ctx, const char *func,
     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 &&
-          !ctx->Extensions.EXT_disjoint_timer_query) {
+      if (!ctx->Extensions.ARB_query_buffer_object) {
           _mesa_error(ctx, GL_INVALID_OPERATION, "%s(not supported)", func);

Can you explain what was the trouble with this change? I don't recall much why this particular change was added but the EXT_disjoint_timer_query spec adds support for int64 and uint64 GL types and params to be used in queries. I can run some tests to check this.


           return;
        }
        if (buf->Size < offset + 4 * (is_64bit ? 2 : 1)) {
           _mesa_error(ctx, GL_INVALID_OPERATION, "%s(out of bounds)", func);
           return;
        }
if (offset < 0) {
           _mesa_error(ctx, GL_INVALID_VALUE, "%s(offset is negative)", func);

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to