Mesa (main): r300: Remove unused RC_OPCODE_CLAMP.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Dec 16 17:06:31 UTC 2021


Module: Mesa
Branch: main
Commit: 495d119aa9b23b2fd7d2c888b22d6741e78714aa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=495d119aa9b23b2fd7d2c888b22d6741e78714aa

Author: Emma Anholt <emma at anholt.net>
Date:   Wed Dec  8 12:24:13 2021 -0800

r300: Remove unused RC_OPCODE_CLAMP.

Nothing generates it in the backend.

Reviewed-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14211>

---

 src/gallium/drivers/r300/compiler/radeon_opcodes.c     |  7 -------
 src/gallium/drivers/r300/compiler/radeon_opcodes.h     |  3 ---
 src/gallium/drivers/r300/compiler/radeon_program_alu.c | 18 ------------------
 3 files changed, 28 deletions(-)

diff --git a/src/gallium/drivers/r300/compiler/radeon_opcodes.c b/src/gallium/drivers/r300/compiler/radeon_opcodes.c
index d134db80c65..a0357a0dc6a 100644
--- a/src/gallium/drivers/r300/compiler/radeon_opcodes.c
+++ b/src/gallium/drivers/r300/compiler/radeon_opcodes.c
@@ -67,13 +67,6 @@ const struct rc_opcode_info rc_opcodes[MAX_RC_OPCODE] = {
 		.HasDstReg = 1,
 		.IsComponentwise = 1
 	},
-	{
-		.Opcode = RC_OPCODE_CLAMP,
-		.Name = "CLAMP",
-		.NumSrcRegs = 3,
-		.HasDstReg = 1,
-		.IsComponentwise = 1
-	},
 	{
 		.Opcode = RC_OPCODE_CMP,
 		.Name = "CMP",
diff --git a/src/gallium/drivers/r300/compiler/radeon_opcodes.h b/src/gallium/drivers/r300/compiler/radeon_opcodes.h
index 6cc2f0455fe..0a0995e106e 100644
--- a/src/gallium/drivers/r300/compiler/radeon_opcodes.h
+++ b/src/gallium/drivers/r300/compiler/radeon_opcodes.h
@@ -51,9 +51,6 @@ typedef enum {
 	/** vec4 instruction: dst.c = ceil(src0.c) */
 	RC_OPCODE_CEIL,
 
-	/** vec4 instruction: dst.c = clamp(src0.c, src1.c, src2.c) */
-	RC_OPCODE_CLAMP,
-
 	/** vec4 instruction: dst.c = src0.c < 0.0 ? src1.c : src2.c */
 	RC_OPCODE_CMP,
 
diff --git a/src/gallium/drivers/r300/compiler/radeon_program_alu.c b/src/gallium/drivers/r300/compiler/radeon_program_alu.c
index 0703fc1a560..6b7a282e093 100644
--- a/src/gallium/drivers/r300/compiler/radeon_program_alu.c
+++ b/src/gallium/drivers/r300/compiler/radeon_program_alu.c
@@ -246,22 +246,6 @@ static void transform_CEIL(struct radeon_compiler* c,
 	rc_remove_instruction(inst);
 }
 
-static void transform_CLAMP(struct radeon_compiler *c,
-	struct rc_instruction *inst)
-{
-	/* CLAMP dst, src, min, max
-	 *    into:
-	 * MIN tmp, src, max
-	 * MAX dst, tmp, min
-	 */
-	struct rc_dst_register dst = try_to_reuse_dst(c, inst);
-	emit2(c, inst->Prev, RC_OPCODE_MIN, 0, dst,
-		inst->U.I.SrcReg[0], inst->U.I.SrcReg[2]);
-	emit2(c, inst->Prev, RC_OPCODE_MAX, &inst->U.I, inst->U.I.DstReg,
-		srcreg(RC_FILE_TEMPORARY, dst.Index), inst->U.I.SrcReg[1]);
-	rc_remove_instruction(inst);
-}
-
 static void transform_DP2(struct radeon_compiler* c,
 	struct rc_instruction* inst)
 {
@@ -630,7 +614,6 @@ int radeonTransformALU(
 {
 	switch(inst->U.I.Opcode) {
 	case RC_OPCODE_CEIL: transform_CEIL(c, inst); return 1;
-	case RC_OPCODE_CLAMP: transform_CLAMP(c, inst); return 1;
 	case RC_OPCODE_DP2: transform_DP2(c, inst); return 1;
 	case RC_OPCODE_DPH: transform_DPH(c, inst); return 1;
 	case RC_OPCODE_DST: transform_DST(c, inst); return 1;
@@ -861,7 +844,6 @@ int r300_transform_vertex_alu(
 {
 	switch(inst->U.I.Opcode) {
 	case RC_OPCODE_CEIL: transform_CEIL(c, inst); return 1;
-	case RC_OPCODE_CLAMP: transform_CLAMP(c, inst); return 1;
 	case RC_OPCODE_CMP: transform_r300_vertex_CMP(c, inst); return 1;
 	case RC_OPCODE_DP2: transform_r300_vertex_DP2(c, inst); return 1;
 	case RC_OPCODE_DP3: transform_r300_vertex_DP3(c, inst); return 1;



More information about the mesa-commit mailing list