fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

r600: cleanup set_occlusion_query_state

Browse source 
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>
This commit is contained in:
Nicolai Hähnle 2017-09-28 21:46:30 +02:00
parent 5184a1e8ee
commit c49400a03b
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/r600/r600_pipe_common.h
View file

@ -703,9 +703,6 @@ struct r600_common_context {
void (*rebind_buffer)(struct pipe_context *ctx, struct pipe_resource *buf, void (*rebind_buffer)(struct pipe_context *ctx, struct pipe_resource *buf,
uint64_t old_gpu_address); 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); void (*save_qbo_state)(struct pipe_context *ctx, struct r600_qbo_state *st);
/* This ensures there is enough space in the command stream. */ /* This ensures there is enough space in the command stream. */

4
src/gallium/drivers/r600/r600_query.c
View file

@ -23,6 +23,7 @@
*/ */
#include "r600_query.h" #include "r600_query.h"
#include "r600_pipe.h"
#include "r600_cs.h" #include "r600_cs.h"
#include "util/u_memory.h" #include "util/u_memory.h"
#include "util/u_upload_mgr.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; perfect_enable = rctx->num_perfect_occlusion_queries != 0;
if (enable != old_enable || perfect_enable != old_perfect_enable) { 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);
} }
} }
} }

10
src/gallium/drivers/r600/r600_state_common.c
View file

@ -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, static void r600_need_gfx_cs_space(struct pipe_context *ctx, unsigned num_dw,
bool include_draw_vbo) 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.set_active_query_state = r600_set_active_query_state;
rctx->b.b.draw_vbo = r600_draw_vbo; rctx->b.b.draw_vbo = r600_draw_vbo;
rctx->b.invalidate_buffer = r600_invalidate_buffer; 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; rctx->b.need_gfx_cs_space = r600_need_gfx_cs_space;
} }