Mesa (gallium-no-nvidia-opcodes): gallium: Remove TGSI_OPCODE_UP2H/UP2US/ UP4B/UP4UB.
Michał Król
michal at kemper.freedesktop.org
Mon Mar 1 17:30:17 UTC 2010
Module: Mesa
Branch: gallium-no-nvidia-opcodes
Commit: 99be17a85522f252ad004612c863ab28e4e7bd42
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=99be17a85522f252ad004612c863ab28e4e7bd42
Author: Michal Krol <michal at vmware.com>
Date: Mon Mar 1 18:27:44 2010 +0100
gallium: Remove TGSI_OPCODE_UP2H/UP2US/UP4B/UP4UB.
---
src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 24 ---------------
.../auxiliary/tgsi/tgsi-instruction-set.txt | 20 ------------
src/gallium/auxiliary/tgsi/tgsi_exec.c | 16 ----------
src/gallium/auxiliary/tgsi/tgsi_info.c | 8 ++--
src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h | 4 --
src/gallium/auxiliary/tgsi/tgsi_sse2.c | 16 ----------
src/gallium/docs/source/tgsi.rst | 32 --------------------
src/gallium/drivers/cell/spu/spu_exec.c | 16 ----------
src/gallium/drivers/r300/r300_tgsi_to_rc.c | 4 --
src/gallium/include/pipe/p_shader_tokens.h | 5 +--
10 files changed, 5 insertions(+), 140 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
index c1ad0b7..497f328 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
@@ -1023,30 +1023,6 @@ emit_instruction(
return 0;
break;
- case TGSI_OPCODE_UP2H:
- /* deprecated */
- assert (0);
- return 0;
- break;
-
- case TGSI_OPCODE_UP2US:
- /* deprecated */
- assert(0);
- return 0;
- break;
-
- case TGSI_OPCODE_UP4B:
- /* deprecated */
- assert(0);
- return 0;
- break;
-
- case TGSI_OPCODE_UP4UB:
- /* deprecated */
- assert(0);
- return 0;
- break;
-
case TGSI_OPCODE_X2D:
/* deprecated? */
assert(0);
diff --git a/src/gallium/auxiliary/tgsi/tgsi-instruction-set.txt b/src/gallium/auxiliary/tgsi/tgsi-instruction-set.txt
index 5f80655..008114d 100644
--- a/src/gallium/auxiliary/tgsi/tgsi-instruction-set.txt
+++ b/src/gallium/auxiliary/tgsi/tgsi-instruction-set.txt
@@ -459,26 +459,6 @@ TGSI Instruction Specification
TBD
-1.5.26 UP2H - Unpack Two 16-Bit Floats
-
- TBD
-
-
-1.5.27 UP2US - Unpack Two Unsigned 16-Bit Scalars
-
- TBD
-
-
-1.5.28 UP4B - Unpack Four Signed 8-Bit Values
-
- TBD
-
-
-1.5.29 UP4UB - Unpack Four Unsigned 8-Bit Scalars
-
- TBD
-
-
1.5.30 X2D - 2D Coordinate Transformation
dst.x = src0.x + src1.x * src2.x + src1.y * src2.y
diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index e0d2cdc..899265d 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -2913,22 +2913,6 @@ exec_instruction(
exec_tex(mach, inst, TEX_MODIFIER_PROJECTED);
break;
- case TGSI_OPCODE_UP2H:
- assert (0);
- break;
-
- case TGSI_OPCODE_UP2US:
- assert (0);
- break;
-
- case TGSI_OPCODE_UP4B:
- assert (0);
- break;
-
- case TGSI_OPCODE_UP4UB:
- assert (0);
- break;
-
case TGSI_OPCODE_X2D:
FETCH(&r[0], 1, CHAN_X);
FETCH(&r[1], 1, CHAN_Y);
diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c
index f2a63d2..227c352 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_info.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
@@ -86,10 +86,10 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
{ 1, 2, 1, 0, 0, 0, "TEX", TGSI_OPCODE_TEX },
{ 1, 4, 1, 0, 0, 0, "TXD", TGSI_OPCODE_TXD },
{ 1, 2, 1, 0, 0, 0, "TXP", TGSI_OPCODE_TXP },
- { 1, 1, 0, 0, 0, 0, "UP2H", TGSI_OPCODE_UP2H },
- { 1, 1, 0, 0, 0, 0, "UP2US", TGSI_OPCODE_UP2US },
- { 1, 1, 0, 0, 0, 0, "UP4B", TGSI_OPCODE_UP4B },
- { 1, 1, 0, 0, 0, 0, "UP4UB", TGSI_OPCODE_UP4UB },
+ { 0, 0, 0, 0, 0, 0, "", 55 }, /* removed */
+ { 0, 0, 0, 0, 0, 0, "", 56 }, /* removed */
+ { 0, 0, 0, 0, 0, 0, "", 57 }, /* removed */
+ { 0, 0, 0, 0, 0, 0, "", 58 }, /* removed */
{ 1, 3, 0, 0, 0, 0, "X2D", TGSI_OPCODE_X2D },
{ 1, 1, 0, 0, 0, 0, "ARA", TGSI_OPCODE_ARA },
{ 1, 1, 0, 0, 0, 0, "ARR", TGSI_OPCODE_ARR },
diff --git a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
index 58bb445..69b1573 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
@@ -85,10 +85,6 @@ OP12(SNE)
OP12_TEX(TEX)
OP14_TEX(TXD)
OP12_TEX(TXP)
-OP11(UP2H)
-OP11(UP2US)
-OP11(UP4B)
-OP11(UP4UB)
OP13(X2D)
OP11(ARA)
OP11(ARR)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_sse2.c b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
index 8600d74..4765bf6 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_sse2.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
@@ -2296,22 +2296,6 @@ emit_instruction(
return 0;
break;
- case TGSI_OPCODE_UP2H:
- return 0;
- break;
-
- case TGSI_OPCODE_UP2US:
- return 0;
- break;
-
- case TGSI_OPCODE_UP4B:
- return 0;
- break;
-
- case TGSI_OPCODE_UP4UB:
- return 0;
- break;
-
case TGSI_OPCODE_X2D:
return 0;
break;
diff --git a/src/gallium/docs/source/tgsi.rst b/src/gallium/docs/source/tgsi.rst
index bb3ce02..ed6655f 100644
--- a/src/gallium/docs/source/tgsi.rst
+++ b/src/gallium/docs/source/tgsi.rst
@@ -546,38 +546,6 @@ This instruction replicates its result.
TBD
-.. opcode:: UP2H - Unpack Two 16-Bit Floats
-
- TBD
-
-.. note::
-
- Considered for removal.
-
-.. opcode:: UP2US - Unpack Two Unsigned 16-Bit Scalars
-
- TBD
-
-.. note::
-
- Considered for removal.
-
-.. opcode:: UP4B - Unpack Four Signed 8-Bit Values
-
- TBD
-
-.. note::
-
- Considered for removal.
-
-.. opcode:: UP4UB - Unpack Four Unsigned 8-Bit Scalars
-
- TBD
-
-.. note::
-
- Considered for removal.
-
.. opcode:: X2D - 2D Coordinate Transformation
.. math::
diff --git a/src/gallium/drivers/cell/spu/spu_exec.c b/src/gallium/drivers/cell/spu/spu_exec.c
index d628cb4..10c728c 100644
--- a/src/gallium/drivers/cell/spu/spu_exec.c
+++ b/src/gallium/drivers/cell/spu/spu_exec.c
@@ -1408,22 +1408,6 @@ exec_instruction(
exec_tex(mach, inst, TRUE, TRUE);
break;
- case TGSI_OPCODE_UP2H:
- ASSERT (0);
- break;
-
- case TGSI_OPCODE_UP2US:
- ASSERT (0);
- break;
-
- case TGSI_OPCODE_UP4B:
- ASSERT (0);
- break;
-
- case TGSI_OPCODE_UP4UB:
- ASSERT (0);
- break;
-
case TGSI_OPCODE_X2D:
ASSERT (0);
break;
diff --git a/src/gallium/drivers/r300/r300_tgsi_to_rc.c b/src/gallium/drivers/r300/r300_tgsi_to_rc.c
index 391c4ad..2b4cdbe 100644
--- a/src/gallium/drivers/r300/r300_tgsi_to_rc.c
+++ b/src/gallium/drivers/r300/r300_tgsi_to_rc.c
@@ -82,10 +82,6 @@ static unsigned translate_opcode(unsigned opcode)
case TGSI_OPCODE_TEX: return RC_OPCODE_TEX;
case TGSI_OPCODE_TXD: return RC_OPCODE_TXD;
case TGSI_OPCODE_TXP: return RC_OPCODE_TXP;
- /* case TGSI_OPCODE_UP2H: return RC_OPCODE_UP2H; */
- /* case TGSI_OPCODE_UP2US: return RC_OPCODE_UP2US; */
- /* case TGSI_OPCODE_UP4B: return RC_OPCODE_UP4B; */
- /* case TGSI_OPCODE_UP4UB: return RC_OPCODE_UP4UB; */
/* case TGSI_OPCODE_X2D: return RC_OPCODE_X2D; */
/* case TGSI_OPCODE_ARA: return RC_OPCODE_ARA; */
/* case TGSI_OPCODE_ARR: return RC_OPCODE_ARR; */
diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h
index db04353..fc14717 100644
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -253,10 +253,7 @@ struct tgsi_property_data {
#define TGSI_OPCODE_TEX 52
#define TGSI_OPCODE_TXD 53
#define TGSI_OPCODE_TXP 54
-#define TGSI_OPCODE_UP2H 55
-#define TGSI_OPCODE_UP2US 56
-#define TGSI_OPCODE_UP4B 57
-#define TGSI_OPCODE_UP4UB 58
+ /* gap */
#define TGSI_OPCODE_X2D 59
#define TGSI_OPCODE_ARA 60
#define TGSI_OPCODE_ARR 61
More information about the mesa-commit
mailing list