summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward O'Callaghan <[email protected]>2015-09-01 18:38:34 +1000
committerMarek Olšák <[email protected]>2015-09-01 21:55:23 +0200
commitd351bab9c52e96026b2d49cdfd0dc68fdd9a499e (patch)
treede31cee6336c22eb8c9e2538d5f5224294da242f
parent2d8f7d3c153bf73fa7137b89e194d4e0e79d943d (diff)
r600g: Simplify out a couple of unnecessary branches
Signed-off-by: Edward O'Callaghan <[email protected]>
-rw-r--r--src/gallium/drivers/r600/r600_shader.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index b7d7828a9c2..1ab389c830b 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -1966,13 +1966,9 @@ static int r600_shader_from_tgsi(struct r600_context *rctx,
ctx.nliterals = 0;
ctx.literals = NULL;
- shader->fs_write_all = FALSE;
- if (ctx.info.properties[TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS])
- shader->fs_write_all = TRUE;
- shader->vs_position_window_space = FALSE;
- if (ctx.info.properties[TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION])
- shader->vs_position_window_space = TRUE;
+ shader->fs_write_all = ctx.info.properties[TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS];
+ shader->vs_position_window_space = ctx.info.properties[TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION];
if (shader->vs_as_gs_a)
vs_add_primid_output(&ctx, key.vs.prim_id_out);