From b0d39384307d979ba85de6c978661e9e58715bec Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 5 Mar 2017 13:07:28 -0700 Subject: [PATCH] gallium: s/uint/enum pipe_render_cond_flag/ for set_render_condition() Reviewed-by: Edward O'Callaghan --- src/gallium/auxiliary/cso_cache/cso_context.c | 3 ++- src/gallium/auxiliary/cso_cache/cso_context.h | 3 ++- src/gallium/auxiliary/util/u_blitter.h | 2 +- src/gallium/drivers/ddebug/dd_context.c | 2 +- src/gallium/drivers/freedreno/freedreno_query.c | 2 +- src/gallium/drivers/nouveau/nv30/nv30_query.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_query.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_query.c | 2 +- src/gallium/drivers/r300/r300_query.c | 2 +- src/gallium/drivers/radeon/r600_query.c | 2 +- src/gallium/drivers/svga/svga_pipe_query.c | 2 +- src/gallium/drivers/swr/swr_context.cpp | 2 +- src/gallium/drivers/trace/tr_context.c | 2 +- src/gallium/drivers/virgl/virgl_encode.c | 2 +- src/gallium/drivers/virgl/virgl_encode.h | 2 +- src/gallium/drivers/virgl/virgl_query.c | 2 +- src/gallium/include/pipe/p_context.h | 2 +- 17 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c index d033ed380e9..3d3c44cf81a 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.c +++ b/src/gallium/auxiliary/cso_cache/cso_context.c @@ -852,7 +852,8 @@ cso_restore_stencil_ref(struct cso_context *ctx) void cso_set_render_condition(struct cso_context *ctx, struct pipe_query *query, - boolean condition, uint mode) + boolean condition, + enum pipe_render_cond_flag mode) { struct pipe_context *pipe = ctx->pipe; diff --git a/src/gallium/auxiliary/cso_cache/cso_context.h b/src/gallium/auxiliary/cso_cache/cso_context.h index 56b1f827577..742bbb516f1 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.h +++ b/src/gallium/auxiliary/cso_cache/cso_context.h @@ -150,7 +150,8 @@ void cso_set_stencil_ref(struct cso_context *cso, void cso_set_render_condition(struct cso_context *cso, struct pipe_query *query, - boolean condition, uint mode); + boolean condition, + enum pipe_render_cond_flag mode); #define CSO_BIT_AUX_VERTEX_BUFFER_SLOT 0x1 diff --git a/src/gallium/auxiliary/util/u_blitter.h b/src/gallium/auxiliary/util/u_blitter.h index d7d9f4a40ee..f47c3dd07e9 100644 --- a/src/gallium/auxiliary/util/u_blitter.h +++ b/src/gallium/auxiliary/util/u_blitter.h @@ -535,7 +535,7 @@ static inline void util_blitter_save_render_condition(struct blitter_context *blitter, struct pipe_query *query, boolean condition, - uint mode) + enum pipe_render_cond_flag mode) { blitter->saved_render_cond_query = query; blitter->saved_render_cond_mode = mode; diff --git a/src/gallium/drivers/ddebug/dd_context.c b/src/gallium/drivers/ddebug/dd_context.c index 775823c2a06..d73b094ffaf 100644 --- a/src/gallium/drivers/ddebug/dd_context.c +++ b/src/gallium/drivers/ddebug/dd_context.c @@ -161,7 +161,7 @@ dd_context_set_active_query_state(struct pipe_context *_pipe, boolean enable) static void dd_context_render_condition(struct pipe_context *_pipe, struct pipe_query *query, boolean condition, - uint mode) + enum pipe_render_cond_flag mode) { struct dd_context *dctx = dd_context(_pipe); struct pipe_context *pipe = dctx->pipe; diff --git a/src/gallium/drivers/freedreno/freedreno_query.c b/src/gallium/drivers/freedreno/freedreno_query.c index 18e0c793c51..1e72c6d65f1 100644 --- a/src/gallium/drivers/freedreno/freedreno_query.c +++ b/src/gallium/drivers/freedreno/freedreno_query.c @@ -84,7 +84,7 @@ fd_get_query_result(struct pipe_context *pctx, struct pipe_query *pq, static void fd_render_condition(struct pipe_context *pctx, struct pipe_query *pq, - boolean condition, uint mode) + boolean condition, enum pipe_render_cond_flag mode) { struct fd_context *ctx = fd_context(pctx); ctx->cond_query = pq; diff --git a/src/gallium/drivers/nouveau/nv30/nv30_query.c b/src/gallium/drivers/nouveau/nv30/nv30_query.c index aa9a12fe3bd..83ea3afec02 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_query.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_query.c @@ -238,7 +238,7 @@ nv30_query_result(struct pipe_context *pipe, struct pipe_query *pq, static void nv40_query_render_condition(struct pipe_context *pipe, struct pipe_query *pq, - boolean condition, uint mode) + boolean condition, enum pipe_render_cond_flag mode) { struct nv30_context *nv30 = nv30_context(pipe); struct nv30_query *q = nv30_query(pq); diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query.c b/src/gallium/drivers/nouveau/nv50/nv50_query.c index e57e3ac8c3b..ec6ee0f5eb3 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_query.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_query.c @@ -73,7 +73,7 @@ nv50_get_query_result(struct pipe_context *pipe, struct pipe_query *pq, static void nv50_render_condition(struct pipe_context *pipe, struct pipe_query *pq, - boolean condition, uint mode) + boolean condition, enum pipe_render_cond_flag mode) { struct nv50_context *nv50 = nv50_context(pipe); struct nouveau_pushbuf *push = nv50->base.pushbuf; diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c index 24aa5ed2be4..e3090745e3b 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c @@ -95,7 +95,7 @@ nvc0_get_query_result_resource(struct pipe_context *pipe, static void nvc0_render_condition(struct pipe_context *pipe, struct pipe_query *pq, - boolean condition, uint mode) + boolean condition, enum pipe_render_cond_flag mode) { struct nvc0_context *nvc0 = nvc0_context(pipe); struct nouveau_pushbuf *push = nvc0->base.pushbuf; diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c index 79e2198d3a7..d2dc7b73c05 100644 --- a/src/gallium/drivers/r300/r300_query.c +++ b/src/gallium/drivers/r300/r300_query.c @@ -182,7 +182,7 @@ static boolean r300_get_query_result(struct pipe_context* pipe, static void r300_render_condition(struct pipe_context *pipe, struct pipe_query *query, boolean condition, - uint mode) + enum pipe_render_cond_flag mode) { struct r300_context *r300 = r300_context(pipe); union pipe_query_result result; diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index bcc573169b2..2c3b5f4dd1d 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -1583,7 +1583,7 @@ static void r600_query_hw_get_result_resource(struct r600_common_context *rctx, static void r600_render_condition(struct pipe_context *ctx, struct pipe_query *query, boolean condition, - uint mode) + enum pipe_render_cond_flag mode) { struct r600_common_context *rctx = (struct r600_common_context *)ctx; struct r600_query_hw *rquery = (struct r600_query_hw *)query; diff --git a/src/gallium/drivers/svga/svga_pipe_query.c b/src/gallium/drivers/svga/svga_pipe_query.c index e8bae264cf1..06c0c811ec9 100644 --- a/src/gallium/drivers/svga/svga_pipe_query.c +++ b/src/gallium/drivers/svga/svga_pipe_query.c @@ -1193,7 +1193,7 @@ svga_get_query_result(struct pipe_context *pipe, static void svga_render_condition(struct pipe_context *pipe, struct pipe_query *q, - boolean condition, uint mode) + boolean condition, enum pipe_render_cond_flag mode) { struct svga_context *svga = svga_context(pipe); struct svga_winsys_screen *sws = svga_screen(svga->pipe.screen)->sws; diff --git a/src/gallium/drivers/swr/swr_context.cpp b/src/gallium/drivers/swr/swr_context.cpp index 1c98ac2de34..8c5a2692db7 100644 --- a/src/gallium/drivers/swr/swr_context.cpp +++ b/src/gallium/drivers/swr/swr_context.cpp @@ -394,7 +394,7 @@ static void swr_render_condition(struct pipe_context *pipe, struct pipe_query *query, boolean condition, - uint mode) + enum pipe_render_cond_flag mode) { struct swr_context *ctx = swr_context(pipe); diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c index 18032380d2d..40a56df4e5f 100644 --- a/src/gallium/drivers/trace/tr_context.c +++ b/src/gallium/drivers/trace/tr_context.c @@ -1580,7 +1580,7 @@ static void trace_context_render_condition(struct pipe_context *_context, struct pipe_query *query, boolean condition, - uint mode) + enum pipe_render_cond_flag mode) { struct trace_context *tr_context = trace_context(_context); struct pipe_context *context = tr_context->pipe; diff --git a/src/gallium/drivers/virgl/virgl_encode.c b/src/gallium/drivers/virgl/virgl_encode.c index 85843b70094..cbe8d19c9d8 100644 --- a/src/gallium/drivers/virgl/virgl_encode.c +++ b/src/gallium/drivers/virgl/virgl_encode.c @@ -821,7 +821,7 @@ int virgl_encoder_get_query_result(struct virgl_context *ctx, int virgl_encoder_render_condition(struct virgl_context *ctx, uint32_t handle, boolean condition, - uint mode) + enum pipe_render_cond_flag mode) { virgl_encoder_write_cmd_dword(ctx, VIRGL_CMD0(VIRGL_CCMD_SET_RENDER_CONDITION, 0, VIRGL_RENDER_CONDITION_SIZE)); virgl_encoder_write_dword(ctx->cbuf, handle); diff --git a/src/gallium/drivers/virgl/virgl_encode.h b/src/gallium/drivers/virgl/virgl_encode.h index 030bcd6d16e..78d4194683b 100644 --- a/src/gallium/drivers/virgl/virgl_encode.h +++ b/src/gallium/drivers/virgl/virgl_encode.h @@ -236,7 +236,7 @@ int virgl_encoder_get_query_result(struct virgl_context *ctx, int virgl_encoder_render_condition(struct virgl_context *ctx, uint32_t handle, boolean condition, - uint mode); + enum pipe_render_cond_flag mode); int virgl_encoder_set_sub_ctx(struct virgl_context *ctx, uint32_t sub_ctx_id); int virgl_encoder_create_sub_ctx(struct virgl_context *ctx, uint32_t sub_ctx_id); diff --git a/src/gallium/drivers/virgl/virgl_query.c b/src/gallium/drivers/virgl/virgl_query.c index 4ddb925b347..e6ca4609c03 100644 --- a/src/gallium/drivers/virgl/virgl_query.c +++ b/src/gallium/drivers/virgl/virgl_query.c @@ -46,7 +46,7 @@ static inline struct virgl_query *virgl_query(struct pipe_query *q) static void virgl_render_condition(struct pipe_context *ctx, struct pipe_query *q, boolean condition, - uint mode) + enum pipe_render_cond_flag mode) { struct virgl_context *vctx = virgl_context(ctx); struct virgl_query *query = virgl_query(q); diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h index fee26f383c7..a29fff514a6 100644 --- a/src/gallium/include/pipe/p_context.h +++ b/src/gallium/include/pipe/p_context.h @@ -119,7 +119,7 @@ struct pipe_context { void (*render_condition)( struct pipe_context *pipe, struct pipe_query *query, boolean condition, - uint mode ); + enum pipe_render_cond_flag mode ); /** * Query objects -- 2.30.2