r600: cleanup set_occlusion_query_state

This fixes a warning caused by the fork (note the change in the function
signature):

../../../../../mesa-src/src/gallium/drivers/r600/r600_state_common.c: In function ‘r600_init_common_state_functions’:
../../../../../mesa-src/src/gallium/drivers/r600/r600_state_common.c:2974:36: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types]
  rctx->b.set_occlusion_query_state = r600_set_occlusion_query_state;

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/r600/r600_pipe_common.h b/src/gallium/drivers/r600/r600_pipe_common.h
index 39dd45aacebbe84270c9cc4be232f0ca750a3ef9..719efb9bbab16ee090356b9995e475639e02d5cf 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe_common.h
+++ b/src/gallium/drivers/r600/r600_pipe_common.h
@@ -703,9 +703,6 @@ struct r600_common_context {
        void (*rebind_buffer)(struct pipe_context *ctx, struct pipe_resource *buf,
                              uint64_t old_gpu_address);
 
-       /* Enable or disable occlusion queries. */
-       void (*set_occlusion_query_state)(struct pipe_context *ctx, bool enable);
-
        void (*save_qbo_state)(struct pipe_context *ctx, struct r600_qbo_state *st);
 
        /* This ensures there is enough space in the command stream. */

diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c
index 03ff1018a7146e69fb73c1120192810ef7ead72e..4c6311c79e0141a041060cad6d4104ab784bf107 100644 (file)
--- a/src/gallium/drivers/r600/r600_query.c
+++ b/src/gallium/drivers/r600/r600_query.c
@@ -23,6 +23,7 @@
  */
 
 #include "r600_query.h"
+#include "r600_pipe.h"
 #include "r600_cs.h"
 #include "util/u_memory.h"
 #include "util/u_upload_mgr.h"
@@ -710,7 +711,8 @@ static void r600_update_occlusion_query_state(struct r600_common_context *rctx,
                perfect_enable = rctx->num_perfect_occlusion_queries != 0;
 
                if (enable != old_enable || perfect_enable != old_perfect_enable) {
-                       rctx->set_occlusion_query_state(&rctx->b, enable);
+                       struct r600_context *ctx = (struct r600_context*)rctx;
+                       r600_mark_atom_dirty(ctx, &ctx->db_misc_state.atom);
                }
        }
 }

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 38f4ca0fc468da83a7d43d69faacc2b18502a2de..7e2b34bf798323bd580bb5ad26a378c140212265 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -2914,15 +2914,6 @@ static void r600_set_active_query_state(struct pipe_context *ctx, boolean enable
        }
 }
 
-static void r600_set_occlusion_query_state(struct pipe_context *ctx,
-                                          bool old_enable,
-                                          bool old_perfect_enable)
-{
-       struct r600_context *rctx = (struct r600_context*)ctx;
-
-       r600_mark_atom_dirty(rctx, &rctx->db_misc_state.atom);
-}
-
 static void r600_need_gfx_cs_space(struct pipe_context *ctx, unsigned num_dw,
                                    bool include_draw_vbo)
 {
@@ -2971,6 +2962,5 @@ void r600_init_common_state_functions(struct r600_context *rctx)
        rctx->b.b.set_active_query_state = r600_set_active_query_state;
        rctx->b.b.draw_vbo = r600_draw_vbo;
        rctx->b.invalidate_buffer = r600_invalidate_buffer;
-       rctx->b.set_occlusion_query_state = r600_set_occlusion_query_state;
        rctx->b.need_gfx_cs_space = r600_need_gfx_cs_space;
 }