radeonsi: remove r600_common_context::set_occlusion_query_state

and remove unused old_enable parameter.

Acked-by: Timothy Arceri <tarceri@itsqueeze.com>

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index c4ea893952e1006008a805bf3dd5f8c27f1e86e8..2ac77be3b81d2ca537bae51cc059549bb07e75c1 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -505,11 +505,6 @@ struct r600_common_context {
         * the invalidation. */
        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 old_enable,
-                                         bool old_perfect_enable);
 };
 
 /* r600_buffer_common.c */

diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index d9c402c008973d60b7830bf29b65f5a8e6666318..aa23aac0f7e7f7b2b0e8d0df8e51c4603873dea3 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -713,8 +713,7 @@ 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, old_enable,
-                                                       old_perfect_enable);
+                       si_set_occlusion_query_state(&rctx->b, old_perfect_enable);
                }
        }
 }

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 8b2f075bd4818396f8f80c8142ebc59c6a210668..bb2ce3f00f4859676a64ea92fa9c5f11c8e956d2 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1347,9 +1347,8 @@ static void si_set_active_query_state(struct pipe_context *ctx, boolean enable)
        }
 }
 
-static void si_set_occlusion_query_state(struct pipe_context *ctx,
-                                        bool old_enable,
-                                        bool old_perfect_enable)
+void si_set_occlusion_query_state(struct pipe_context *ctx,
+                                 bool old_perfect_enable)
 {
        struct si_context *sctx = (struct si_context*)ctx;
 
@@ -4588,7 +4587,6 @@ void si_init_state_functions(struct si_context *sctx)
        sctx->b.b.set_tess_state = si_set_tess_state;
 
        sctx->b.b.set_active_query_state = si_set_active_query_state;
-       sctx->b.set_occlusion_query_state = si_set_occlusion_query_state;
 
        sctx->b.b.draw_vbo = si_draw_vbo;
 

diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index dcf38055f4f5f1d0cac13dbcf6b40ab8c5f3453f..d19045c5da25d21ddb935a4f918e334037f74121 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -404,6 +404,8 @@ si_create_sampler_view_custom(struct pipe_context *ctx,
 void si_update_fb_dirtiness_after_rendering(struct si_context *sctx);
 void si_update_ps_iter_samples(struct si_context *sctx);
 void si_save_qbo_state(struct pipe_context *ctx, struct r600_qbo_state *st);
+void si_set_occlusion_query_state(struct pipe_context *ctx,
+                                 bool old_perfect_enable);
 
 /* si_state_binning.c */
 void si_emit_dpbb_state(struct si_context *sctx, struct r600_atom *state);