diff options
| author | Marek Olšák <[email protected]> | 2015-11-07 16:30:01 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2015-11-13 19:54:42 +0100 |
| commit | eb0d3e8a90df3f6a39a3ffc911a335554fc8cd98 (patch) | |
| tree | 681ffbe31d89d4bfa99794469b000fa0f5416275 /src/gallium/drivers/radeon | |
| parent | 70c40cc9899c1e895004c3e25c4f763af44cd17d (diff) | |
gallium/radeon: shorten render_cond variable names
and ..._cond -> ..._invert
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_query.c | 14 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index ba9000f74ec..ebe633b9125 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -418,9 +418,9 @@ struct r600_common_context { /* Render condition. */ struct r600_atom render_cond_atom; - struct pipe_query *current_render_cond; - unsigned current_render_cond_mode; - boolean current_render_cond_cond; + struct pipe_query *render_cond; + unsigned render_cond_mode; + boolean render_cond_invert; bool render_cond_force_off; /* for u_blitter */ /* MSAA sample locations. diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index 9f92587a54b..8c2b601a96c 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -307,7 +307,7 @@ static void r600_emit_query_predication(struct r600_common_context *ctx, struct r600_atom *atom) { struct radeon_winsys_cs *cs = ctx->gfx.cs; - struct r600_query *query = (struct r600_query*)ctx->current_render_cond; + struct r600_query *query = (struct r600_query*)ctx->render_cond; struct r600_query_buffer *qbuf; uint32_t op; bool flag_wait; @@ -315,8 +315,8 @@ static void r600_emit_query_predication(struct r600_common_context *ctx, if (!query) return; - flag_wait = ctx->current_render_cond_mode == PIPE_RENDER_COND_WAIT || - ctx->current_render_cond_mode == PIPE_RENDER_COND_BY_REGION_WAIT; + flag_wait = ctx->render_cond_mode == PIPE_RENDER_COND_WAIT || + ctx->render_cond_mode == PIPE_RENDER_COND_BY_REGION_WAIT; switch (query->type) { case PIPE_QUERY_OCCLUSION_COUNTER: @@ -335,7 +335,7 @@ static void r600_emit_query_predication(struct r600_common_context *ctx, } /* if true then invert, see GL_ARB_conditional_render_inverted */ - if (ctx->current_render_cond_cond) + if (ctx->render_cond_invert) op |= PREDICATION_DRAW_NOT_VISIBLE; /* Draw if not visable/overflow */ else op |= PREDICATION_DRAW_VISIBLE; /* Draw if visable/overflow */ @@ -831,9 +831,9 @@ static void r600_render_condition(struct pipe_context *ctx, struct r600_query_buffer *qbuf; struct r600_atom *atom = &rctx->render_cond_atom; - rctx->current_render_cond = query; - rctx->current_render_cond_cond = condition; - rctx->current_render_cond_mode = mode; + rctx->render_cond = query; + rctx->render_cond_invert = condition; + rctx->render_cond_mode = mode; /* Compute the size of SET_PREDICATION packets. */ atom->num_dw = 0; diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index edfdfe33187..3126cce8c22 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -1324,7 +1324,7 @@ void evergreen_do_fast_color_clear(struct r600_common_context *rctx, { int i; - if (rctx->current_render_cond) + if (rctx->render_cond) return; for (i = 0; i < fb->nr_cbufs; i++) { |