Mesa (master): r600g: Simplify out a couple of unnecessary branches

Marek Olšák mareko at kemper.freedesktop.org
Tue Sep 1 19:55:51 UTC 2015


Module: Mesa
Branch: master
Commit: d351bab9c52e96026b2d49cdfd0dc68fdd9a499e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d351bab9c52e96026b2d49cdfd0dc68fdd9a499e

Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Tue Sep  1 18:38:34 2015 +1000

r600g: Simplify out a couple of unnecessary branches

Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>

---

 src/gallium/drivers/r600/r600_shader.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index b7d7828..1ab389c 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);




More information about the mesa-commit mailing list