From: Jonathan Marek <jonathan@marek.ca>
Date: Wed, 23 Jan 2019 22:43:28 +0000 (-0500)
Subject: freedreno: a2xx: ir2 cleanup
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32b1d2d716ccc85c119e7a46008cdfd6450220e1;p=mesa.git

freedreno: a2xx: ir2 cleanup

Reviewed-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_program.c b/src/gallium/drivers/freedreno/a2xx/fd2_program.c
index da020443bd9..cbb18f84c4c 100644
--- a/src/gallium/drivers/freedreno/a2xx/fd2_program.c
+++ b/src/gallium/drivers/freedreno/a2xx/fd2_program.c
@@ -232,7 +232,7 @@ fd2_program_emit(struct fd_context *ctx, struct fd_ringbuffer *ring,
 
 	vp = prog->vp;
 
-    /* find variant matching the linked fragment shader */
+	/* find variant matching the linked fragment shader */
 	if (!binning) {
 		fp = prog->fp;
 		for (variant = 1; variant < ARRAY_SIZE(vp->variant); variant++) {
diff --git a/src/gallium/drivers/freedreno/a2xx/ir2_nir.c b/src/gallium/drivers/freedreno/a2xx/ir2_nir.c
index 8345e94c363..9b81fc4f558 100644
--- a/src/gallium/drivers/freedreno/a2xx/ir2_nir.c
+++ b/src/gallium/drivers/freedreno/a2xx/ir2_nir.c
@@ -292,7 +292,6 @@ instr_create_alu(struct ir2_context *ctx, nir_op opcode, unsigned ncomp)
 		[nir_op_fmov] = {MAXs, MAXv},
 		[nir_op_fsign] = {-1, CNDGTEv},
 		[nir_op_fnot] = {SETEs, SETEv},
-      [nir_op_f2b32] = {SETNEs, SETNEv},
 		[nir_op_for] = {MAXs, MAXv},
 		[nir_op_fand] = {MINs, MINv},
 		[nir_op_fxor] = {-1, SETNEv},
@@ -446,7 +445,6 @@ emit_alu(struct ir2_context *ctx, nir_alu_instr * alu)
 		instr->src[1] = tmp;
 		break;
 	case nir_op_fcsel:
-	case nir_op_bcsel:
 		tmp = instr->src[1];
 		instr->src[1] = instr->src[2];
 		instr->src[2] = tmp;