KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r600g: Fix false and true.

This commit is contained in:
Corbin Simpson 2010-09-19 18:14:41 -07:00
parent eb347c7ef0
commit 07b9e22a1f
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/r600/eg_hw_states.c
View File

@ -422,11 +422,11 @@ static void eg_dsa(struct r600_context *rctx, struct radeon_state *rstate)
S_028D10_FORCE_HIS_ENABLE0(V_028D10_FORCE_DISABLE) | S_028D10_FORCE_HIS_ENABLE0(V_028D10_FORCE_DISABLE) |
S_028D10_FORCE_HIS_ENABLE1(V_028D10_FORCE_DISABLE); S_028D10_FORCE_HIS_ENABLE1(V_028D10_FORCE_DISABLE);
query_running = false; query_running = FALSE;
LIST_FOR_EACH_ENTRY(rquery, &rctx->query_list, list) { LIST_FOR_EACH_ENTRY(rquery, &rctx->query_list, list) {
if (rquery->state & R600_QUERY_STATE_STARTED) { if (rquery->state & R600_QUERY_STATE_STARTED) {
query_running = true; query_running = TRUE;
} }
} }

2
src/gallium/drivers/r600/r600_context.c
View File

@ -80,7 +80,7 @@ void r600_flush(struct pipe_context *ctx, unsigned flags,
radeon_ctx_submit(rctx->ctx); radeon_ctx_submit(rctx->ctx);
LIST_FOR_EACH_ENTRY(rquery, &rctx->query_list, list) { LIST_FOR_EACH_ENTRY(rquery, &rctx->query_list, list) {
rquery->flushed = true; rquery->flushed = TRUE;
} }
radeon_ctx_clear(rctx->ctx); radeon_ctx_clear(rctx->ctx);

2
src/gallium/drivers/r600/r600_draw.c
View File

@ -156,7 +156,7 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
if (rctx->any_user_vbs) { if (rctx->any_user_vbs) {
r600_upload_user_buffers(rctx); r600_upload_user_buffers(rctx);
rctx->any_user_vbs = false; rctx->any_user_vbs = FALSE;
} }
draw.ctx = ctx; draw.ctx = ctx;

4
src/gallium/drivers/r600/r600_hw_states.c
View File

@ -447,11 +447,11 @@ static void r600_dsa(struct r600_context *rctx, struct radeon_state *rstate)
S_028D10_FORCE_HIS_ENABLE0(V_028D10_FORCE_DISABLE) | S_028D10_FORCE_HIS_ENABLE0(V_028D10_FORCE_DISABLE) |
S_028D10_FORCE_HIS_ENABLE1(V_028D10_FORCE_DISABLE); S_028D10_FORCE_HIS_ENABLE1(V_028D10_FORCE_DISABLE);
query_running = false; query_running = FALSE;
LIST_FOR_EACH_ENTRY(rquery, &rctx->query_list, list) { LIST_FOR_EACH_ENTRY(rquery, &rctx->query_list, list) {
if (rquery->state & R600_QUERY_STATE_STARTED) { if (rquery->state & R600_QUERY_STATE_STARTED) {
query_running = true; query_running = TRUE;
} }
} }

6
src/gallium/drivers/r600/r600_query.c
View File

@ -132,7 +132,7 @@ static void r600_query_resume(struct pipe_context *ctx, struct r600_query *rquer
r600_query_result(ctx, rquery); r600_query_result(ctx, rquery);
} }
r600_query_begin(rctx, rquery); r600_query_begin(rctx, rquery);
rquery->flushed = false; rquery->flushed = FALSE;
} }
static void r600_query_suspend(struct pipe_context *ctx, struct r600_query *rquery) static void r600_query_suspend(struct pipe_context *ctx, struct r600_query *rquery)
@ -151,7 +151,7 @@ static void r600_begin_query(struct pipe_context *ctx, struct pipe_query *query)
rquery->state = R600_QUERY_STATE_STARTED; rquery->state = R600_QUERY_STATE_STARTED;
rquery->num_results = 0; rquery->num_results = 0;
rquery->flushed = false; rquery->flushed = FALSE;
r600_query_resume(ctx, rquery); r600_query_resume(ctx, rquery);
r = radeon_ctx_set_query_state(rctx->ctx, &rquery->rstate); r = radeon_ctx_set_query_state(rctx->ctx, &rquery->rstate);
if (r == -EBUSY) { if (r == -EBUSY) {
@ -231,7 +231,7 @@ static boolean r600_get_query_result(struct pipe_context *ctx,
if (!rquery->flushed) { if (!rquery->flushed) {
ctx->flush(ctx, 0, NULL); ctx->flush(ctx, 0, NULL);
rquery->flushed = true; rquery->flushed = TRUE;
} }
r600_query_result(ctx, rquery); r600_query_result(ctx, rquery);
*result = rquery->result; *result = rquery->result;

2
src/gallium/drivers/r600/r600_resource.h
View File

@ -103,7 +103,7 @@ static INLINE struct r600_resource_buffer *r600_buffer(struct pipe_resource *buf
static INLINE boolean r600_buffer_is_user_buffer(struct pipe_resource *buffer) static INLINE boolean r600_buffer_is_user_buffer(struct pipe_resource *buffer)
{ {
return r600_buffer(buffer)->user_buffer ? true : false; return r600_buffer(buffer)->user_buffer ? TRUE : FALSE;
} }
#endif #endif

4
src/gallium/drivers/r600/r600_shader.c
View File

@ -1530,7 +1530,7 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
r = r600_bc_add_alu(ctx->bc, &alu); r = r600_bc_add_alu(ctx->bc, &alu);
if (r) if (r)
return r; return r;
src_not_temp = false; src_not_temp = FALSE;
src_gpr = ctx->temp_reg; src_gpr = ctx->temp_reg;
} }
@ -1641,7 +1641,7 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
r = r600_bc_add_literal(ctx->bc, lit_vals); r = r600_bc_add_literal(ctx->bc, lit_vals);
if (r) if (r)
return r; return r;
src_not_temp = false; src_not_temp = FALSE;
src_gpr = ctx->temp_reg; src_gpr = ctx->temp_reg;
} }

10
src/gallium/drivers/r600/r600_state2.c
View File

@ -205,7 +205,7 @@ static void r600_pipe_shader_vs(struct pipe_context *ctx, struct r600_pipe_shade
r600_pipe_state_add_reg(rstate, R600_GROUP_CONTEXT, r600_pipe_state_add_reg(rstate, R600_GROUP_CONTEXT,
R_028894_SQ_PGM_START_FS, R_028894_SQ_PGM_START_FS,
0x00000000, 0xFFFFFFFF, shader->bo); 0x00000000, 0xFFFFFFFF, shader->bo);
rctx->vs_rebuild = false; rctx->vs_rebuild = FALSE;
} }
static void r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader *shader) static void r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shader *shader)
@ -275,7 +275,7 @@ static void r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_pipe_shade
r600_pipe_state_add_reg(rstate, R600_GROUP_CONTEXT, r600_pipe_state_add_reg(rstate, R600_GROUP_CONTEXT,
R_0288CC_SQ_PGM_CF_OFFSET_PS, R_0288CC_SQ_PGM_CF_OFFSET_PS,
0x00000000, 0xFFFFFFFF, NULL); 0x00000000, 0xFFFFFFFF, NULL);
rctx->ps_rebuild = false; rctx->ps_rebuild = FALSE;
} }
static int r600_pipe_shader(struct pipe_context *ctx, struct r600_pipe_shader *shader) static int r600_pipe_shader(struct pipe_context *ctx, struct r600_pipe_shader *shader)
@ -1082,10 +1082,10 @@ static void r600_bind_rs_state(struct pipe_context *ctx, void *state)
return; return;
if (rctx->flatshade != rs->flatshade) { if (rctx->flatshade != rs->flatshade) {
rctx->ps_rebuild = true; rctx->ps_rebuild = TRUE;
} }
if (rctx->sprite_coord_enable != rs->sprite_coord_enable) { if (rctx->sprite_coord_enable != rs->sprite_coord_enable) {
rctx->ps_rebuild = true; rctx->ps_rebuild = TRUE;
} }
rctx->flatshade = rs->flatshade; rctx->flatshade = rs->flatshade;
rctx->sprite_coord_enable = rs->sprite_coord_enable; rctx->sprite_coord_enable = rs->sprite_coord_enable;
@ -1371,7 +1371,7 @@ static void r600_bind_vertex_elements(struct pipe_context *ctx, void *state)
rctx->vertex_elements = v; rctx->vertex_elements = v;
if (v) { if (v) {
v->refcount++; v->refcount++;
rctx->vs_rebuild = true; rctx->vs_rebuild = TRUE;
} }
} }