i965/vec4: Combine generate_math[12]_gen6 methods.

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_queryobj.c

diff --git a/src/mesa/drivers/dri/radeon/radeon_queryobj.c b/src/mesa/drivers/dri/radeon/radeon_queryobj.c
index b79d864ba2994a56d6c5335a22c4b124ea8ac3d1..7efe52f0ef0b73f4ba9a4834a689734d06d213c3 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_queryobj.c
+++ b/src/mesa/drivers/dri/radeon/radeon_queryobj.c
@@ -31,24 +31,12 @@
 #include "main/imports.h"
 #include "main/simple_list.h"
 
-static int radeonQueryIsFlushed(GLcontext *ctx, struct gl_query_object *q)
-{
-       radeonContextPtr radeon = RADEON_CONTEXT(ctx);
-       struct radeon_query_object *tmp, *query = (struct radeon_query_object *)q;
-
-       foreach(tmp, &radeon->query.not_flushed_head) {
-               if (tmp == query) {
-                       return 0;
-               }
-       }
+#include <inttypes.h>
 
-       return 1;
-}
-
-static void radeonQueryGetResult(GLcontext *ctx, struct gl_query_object *q)
+static void radeonQueryGetResult(struct gl_context *ctx, struct gl_query_object *q)
 {
        struct radeon_query_object *query = (struct radeon_query_object *)q;
-       uint32_t *result;
+        uint32_t *result;
        int i;
 
        radeon_print(RADEON_STATE, RADEON_VERBOSE,
@@ -56,23 +44,22 @@ static void radeonQueryGetResult(GLcontext *ctx, struct gl_query_object *q)
                        __FUNCTION__, query->Base.Id, (int) query->Base.Result);
 
        radeon_bo_map(query->bo, GL_FALSE);
-
-       result = query->bo->ptr;
+        result = query->bo->ptr;
 
        query->Base.Result = 0;
        for (i = 0; i < query->curr_offset/sizeof(uint32_t); ++i) {
-               query->Base.Result += result[i];
-               radeon_print(RADEON_STATE, RADEON_TRACE, "result[%d] = %d\n", i, result[i]);
+               query->Base.Result += LE32_TO_CPU(result[i]);
+               radeon_print(RADEON_STATE, RADEON_TRACE, "result[%d] = %d\n", i, LE32_TO_CPU(result[i]));
        }
 
        radeon_bo_unmap(query->bo);
 }
 
-static struct gl_query_object * radeonNewQueryObject(GLcontext *ctx, GLuint id)
+static struct gl_query_object * radeonNewQueryObject(struct gl_context *ctx, GLuint id)
 {
        struct radeon_query_object *query;
 
-       query = _mesa_calloc(sizeof(struct radeon_query_object));
+       query = calloc(1, sizeof(struct radeon_query_object));
 
        query->Base.Id = id;
        query->Base.Result = 0;
@@ -84,7 +71,7 @@ static struct gl_query_object * radeonNewQueryObject(GLcontext *ctx, GLuint id)
        return &query->Base;
 }
 
-static void radeonDeleteQuery(GLcontext *ctx, struct gl_query_object *q)
+static void radeonDeleteQuery(struct gl_context *ctx, struct gl_query_object *q)
 {
        struct radeon_query_object *query = (struct radeon_query_object *)q;
 
@@ -94,15 +81,16 @@ static void radeonDeleteQuery(GLcontext *ctx, struct gl_query_object *q)
                radeon_bo_unref(query->bo);
        }
 
-       _mesa_free(query);
+       free(query);
 }
 
-static void radeonWaitQuery(GLcontext *ctx, struct gl_query_object *q)
+static void radeonWaitQuery(struct gl_context *ctx, struct gl_query_object *q)
 {
+       radeonContextPtr radeon = RADEON_CONTEXT(ctx);
        struct radeon_query_object *query = (struct radeon_query_object *)q;
 
        /* If the cmdbuf with packets for this query hasn't been flushed yet, do it now */
-       if (!radeonQueryIsFlushed(ctx, q))
+       if (radeon_bo_is_referenced_by_cs(query->bo, radeon->cmdbuf.cs))
                ctx->Driver.Flush(ctx);
 
        radeon_print(RADEON_STATE, RADEON_VERBOSE, "%s: query id %d, bo %p, offset %d\n", __FUNCTION__, q->Id, query->bo, query->curr_offset);
@@ -113,7 +101,7 @@ static void radeonWaitQuery(GLcontext *ctx, struct gl_query_object *q)
 }
 
 
-static void radeonBeginQuery(GLcontext *ctx, struct gl_query_object *q)
+static void radeonBeginQuery(struct gl_context *ctx, struct gl_query_object *q)
 {
        radeonContextPtr radeon = RADEON_CONTEXT(ctx);
        struct radeon_query_object *query = (struct radeon_query_object *)q;
@@ -123,7 +111,7 @@ static void radeonBeginQuery(GLcontext *ctx, struct gl_query_object *q)
        assert(radeon->query.current == NULL);
 
        if (radeon->dma.flush)
-               radeon->dma.flush(radeon->glCtx);
+               radeon->dma.flush(&radeon->glCtx);
 
        if (!query->bo) {
                query->bo = radeon_bo_open(radeon->radeonScreen->bom, 0, RADEON_QUERY_PAGE_SIZE, RADEON_QUERY_PAGE_SIZE, RADEON_GEM_DOMAIN_GTT, 0);
@@ -134,11 +122,9 @@ static void radeonBeginQuery(GLcontext *ctx, struct gl_query_object *q)
 
        radeon->query.queryobj.dirty = GL_TRUE;
        radeon->hw.is_dirty = GL_TRUE;
-       insert_at_tail(&radeon->query.not_flushed_head, query);
-
 }
 
-void radeonEmitQueryEnd(GLcontext *ctx)
+void radeonEmitQueryEnd(struct gl_context *ctx)
 {
        radeonContextPtr radeon = RADEON_CONTEXT(ctx);
        struct radeon_query_object *query = radeon->query.current;
@@ -158,41 +144,37 @@ void radeonEmitQueryEnd(GLcontext *ctx)
        radeon->vtbl.emit_query_finish(radeon);
 }
 
-static void radeonEndQuery(GLcontext *ctx, struct gl_query_object *q)
+static void radeonEndQuery(struct gl_context *ctx, struct gl_query_object *q)
 {
        radeonContextPtr radeon = RADEON_CONTEXT(ctx);
 
        radeon_print(RADEON_STATE, RADEON_NORMAL, "%s: query id %d\n", __FUNCTION__, q->Id);
 
        if (radeon->dma.flush)
-               radeon->dma.flush(radeon->glCtx);
+               radeon->dma.flush(&radeon->glCtx);
        radeonEmitQueryEnd(ctx);
 
        radeon->query.current = NULL;
 }
 
-static void radeonCheckQuery(GLcontext *ctx, struct gl_query_object *q)
+static void radeonCheckQuery(struct gl_context *ctx, struct gl_query_object *q)
 {
        radeon_print(RADEON_STATE, RADEON_TRACE, "%s: query id %d\n", __FUNCTION__, q->Id);
-
+\
 #ifdef DRM_RADEON_GEM_BUSY
        radeonContextPtr radeon = RADEON_CONTEXT(ctx);
 
-       if (radeon->radeonScreen->kernel_mm) {
-               struct radeon_query_object *query = (struct radeon_query_object *)q;
-               uint32_t domain;
-
-               /* Need to perform a flush, as per ARB_occlusion_query spec */
-               if (!radeonQueryIsFlushed(ctx, q)) {
-                       ctx->Driver.Flush(ctx);
-               }
-
-               if (radeon_bo_is_busy(query->bo, &domain) == 0) {
-                       radeonQueryGetResult(ctx, q);
-                       query->Base.Ready = GL_TRUE;
-               }
-       } else {
-               radeonWaitQuery(ctx, q);
+       struct radeon_query_object *query = (struct radeon_query_object *)q;
+       uint32_t domain;
+
+       /* Need to perform a flush, as per ARB_occlusion_query spec */
+       if (radeon_bo_is_referenced_by_cs(query->bo, radeon->cmdbuf.cs)) {
+               ctx->Driver.Flush(ctx);
+       }
+
+       if (radeon_bo_is_busy(query->bo, &domain) == 0) {
+               radeonQueryGetResult(ctx, q);
+               query->Base.Ready = GL_TRUE;
        }
 #else
        radeonWaitQuery(ctx, q);
@@ -209,7 +191,7 @@ void radeonInitQueryObjFunctions(struct dd_function_table *functions)
        functions->WaitQuery = radeonWaitQuery;
 }
 
-int radeon_check_query_active(GLcontext *ctx, struct radeon_state_atom *atom)
+int radeon_check_query_active(struct gl_context *ctx, struct radeon_state_atom *atom)
 {
        radeonContextPtr radeon = RADEON_CONTEXT(ctx);
        struct radeon_query_object *query = radeon->query.current;
@@ -219,7 +201,7 @@ int radeon_check_query_active(GLcontext *ctx, struct radeon_state_atom *atom)
        return atom->cmd_size;
 }
 
-void radeon_emit_queryobj(GLcontext *ctx, struct radeon_state_atom *atom)
+void radeon_emit_queryobj(struct gl_context *ctx, struct radeon_state_atom *atom)
 {
        radeonContextPtr radeon = RADEON_CONTEXT(ctx);
        BATCH_LOCALS(radeon);
@@ -227,7 +209,7 @@ void radeon_emit_queryobj(GLcontext *ctx, struct radeon_state_atom *atom)
 
        dwords = (*atom->check) (ctx, atom);
 
-       BEGIN_BATCH_NO_AUTOSTATE(dwords);
+       BEGIN_BATCH(dwords);
        OUT_BATCH_TABLE(atom->cmd, dwords);
        END_BATCH();