Module: Mesa
Branch: gallium-no-nvidia-opcodes
Commit: 5efeade4dc7ffe2d10b231b56fac60dbaa8aa0c8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5efeade4dc7ffe2d10b231b56fac60dbaa8aa0c8
Author: Michal Krol <mic...@vmware.com>
Date: Mon Mar 1 18:12:00 2010 +0100
gallium: Remove TGSI_OPCODE_PK2H/PK2US/PK4B/PK4UB.
---
src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 16 ----------------
.../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 | 20 --------------------
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(+), 120 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
index 4cf28a9..8a1c9ec 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
@@ -966,22 +966,6 @@ emit_instruction(
emit_kil( bld, inst );
break;
- case TGSI_OPCODE_PK2H:
- return 0;
- break;
-
- case TGSI_OPCODE_PK2US:
- return 0;
- break;
-
- case TGSI_OPCODE_PK4B:
- return 0;
- break;
-
- case TGSI_OPCODE_PK4UB:
- return 0;
- break;
-
case TGSI_OPCODE_RFL:
return 0;
break;
diff --git a/src/gallium/auxiliary/tgsi/tgsi-instruction-set.txt
b/src/gallium/auxiliary/tgsi/tgsi-instruction-set.txt
index 080fd4c..0d53ff5 100644
--- a/src/gallium/auxiliary/tgsi/tgsi-instruction-set.txt
+++ b/src/gallium/auxiliary/tgsi/tgsi-instruction-set.txt
@@ -391,26 +391,6 @@ TGSI Instruction Specification
Alias for LERP.
-1.5.10 PK2H - Pack Two 16-bit Floats
-
- TBD
-
-
-1.5.11 PK2US - Pack Two Unsigned 16-bit Scalars
-
- TBD
-
-
-1.5.12 PK4B - Pack Four Signed 8-bit Scalars
-
- TBD
-
-
-1.5.13 PK4UB - Pack Four Unsigned 8-bit Scalars
-
- TBD
-
-
1.5.14 POW - Power
Alias for POWER.
diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c
b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index f853ea2..939786c 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -2807,22 +2807,6 @@ exec_instruction(
exec_kil (mach, inst);
break;
- case TGSI_OPCODE_PK2H:
- assert (0);
- break;
-
- case TGSI_OPCODE_PK2US:
- assert (0);
- break;
-
- case TGSI_OPCODE_PK4B:
- assert (0);
- break;
-
- case TGSI_OPCODE_PK4UB:
- assert (0);
- break;
-
case TGSI_OPCODE_RFL:
if (IS_CHANNEL_ENABLED(*inst, CHAN_X) ||
IS_CHANNEL_ENABLED(*inst, CHAN_Y) ||
diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c
b/src/gallium/auxiliary/tgsi/tgsi_info.c
index de0e09c..b858ff9 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_info.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
@@ -71,10 +71,10 @@ static const struct tgsi_opcode_info
opcode_info[TGSI_OPCODE_LAST] =
{ 1, 1, 0, 0, 0, 0, "DDX", TGSI_OPCODE_DDX },
{ 1, 1, 0, 0, 0, 0, "DDY", TGSI_OPCODE_DDY },
{ 0, 0, 0, 0, 0, 0, "KILP", TGSI_OPCODE_KILP },
- { 1, 1, 0, 0, 0, 0, "PK2H", TGSI_OPCODE_PK2H },
- { 1, 1, 0, 0, 0, 0, "PK2US", TGSI_OPCODE_PK2US },
- { 1, 1, 0, 0, 0, 0, "PK4B", TGSI_OPCODE_PK4B },
- { 1, 1, 0, 0, 0, 0, "PK4UB", TGSI_OPCODE_PK4UB },
+ { 0, 0, 0, 0, 0, 0, "", 40 }, /* removed */
+ { 0, 0, 0, 0, 0, 0, "", 41 }, /* removed */
+ { 0, 0, 0, 0, 0, 0, "", 42 }, /* removed */
+ { 0, 0, 0, 0, 0, 0, "", 43 }, /* removed */
{ 1, 2, 0, 0, 0, 0, "RFL", TGSI_OPCODE_RFL },
{ 1, 2, 0, 0, 0, 0, "SEQ", TGSI_OPCODE_SEQ },
{ 1, 2, 0, 0, 0, 0, "SFL", TGSI_OPCODE_SFL },
diff --git a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
index e4af15c..a0e454b 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
@@ -76,10 +76,6 @@ OP11(COS)
OP11(DDX)
OP11(DDY)
OP00(KILP)
-OP11(PK2H)
-OP11(PK2US)
-OP11(PK4B)
-OP11(PK4UB)
OP12(RFL)
OP12(SEQ)
OP12(SFL)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_sse2.c
b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
index a85cc46..1ad9e46 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_sse2.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
@@ -2260,22 +2260,6 @@ emit_instruction(
emit_kil( func, &inst->Src[0] );
break;
- case TGSI_OPCODE_PK2H:
- return 0;
- break;
-
- case TGSI_OPCODE_PK2US:
- return 0;
- break;
-
- case TGSI_OPCODE_PK4B:
- return 0;
- break;
-
- case TGSI_OPCODE_PK4UB:
- return 0;
- break;
-
case TGSI_OPCODE_RFL:
return 0;
break;
diff --git a/src/gallium/docs/source/tgsi.rst b/src/gallium/docs/source/tgsi.rst
index c292cd3..c7bc096 100644
--- a/src/gallium/docs/source/tgsi.rst
+++ b/src/gallium/docs/source/tgsi.rst
@@ -453,26 +453,6 @@ This instruction replicates its result.
discard
-.. opcode:: PK2H - Pack Two 16-bit Floats
-
- TBD
-
-
-.. opcode:: PK2US - Pack Two Unsigned 16-bit Scalars
-
- TBD
-
-
-.. opcode:: PK4B - Pack Four Signed 8-bit Scalars
-
- TBD
-
-
-.. opcode:: PK4UB - Pack Four Unsigned 8-bit Scalars
-
- TBD
-
-
.. opcode:: RFL - Reflection Vector
.. math::
diff --git a/src/gallium/drivers/cell/spu/spu_exec.c
b/src/gallium/drivers/cell/spu/spu_exec.c
index d2166a4..7120efa 100644
--- a/src/gallium/drivers/cell/spu/spu_exec.c
+++ b/src/gallium/drivers/cell/spu/spu_exec.c
@@ -1315,22 +1315,6 @@ exec_instruction(
exec_kil (mach, inst);
break;
- case TGSI_OPCODE_PK2H:
- ASSERT (0);
- break;
-
- case TGSI_OPCODE_PK2US:
- ASSERT (0);
- break;
-
- case TGSI_OPCODE_PK4B:
- ASSERT (0);
- break;
-
- case TGSI_OPCODE_PK4UB:
- ASSERT (0);
- break;
-
case TGSI_OPCODE_RFL:
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 aff4ddd..f3f674f 100644
--- a/src/gallium/drivers/r300/r300_tgsi_to_rc.c
+++ b/src/gallium/drivers/r300/r300_tgsi_to_rc.c
@@ -73,10 +73,6 @@ static unsigned translate_opcode(unsigned opcode)
case TGSI_OPCODE_DDX: return RC_OPCODE_DDX;
case TGSI_OPCODE_DDY: return RC_OPCODE_DDY;
/* case TGSI_OPCODE_KILP: return RC_OPCODE_KILP; */
- /* case TGSI_OPCODE_PK2H: return RC_OPCODE_PK2H; */
- /* case TGSI_OPCODE_PK2US: return RC_OPCODE_PK2US; */
- /* case TGSI_OPCODE_PK4B: return RC_OPCODE_PK4B; */
- /* case TGSI_OPCODE_PK4UB: return RC_OPCODE_PK4UB; */
/* case TGSI_OPCODE_RFL: return RC_OPCODE_RFL; */
case TGSI_OPCODE_SEQ: return RC_OPCODE_SEQ;
case TGSI_OPCODE_SFL: return RC_OPCODE_SFL;
diff --git a/src/gallium/include/pipe/p_shader_tokens.h
b/src/gallium/include/pipe/p_shader_tokens.h
index c5c480f..61637c4 100644
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -241,10 +241,7 @@ struct tgsi_property_data {
#define TGSI_OPCODE_DDX 37
#define TGSI_OPCODE_DDY 38
#define TGSI_OPCODE_KILP 39 /* predicated kill */
-#define TGSI_OPCODE_PK2H 40
-#define TGSI_OPCODE_PK2US 41
-#define TGSI_OPCODE_PK4B 42
-#define TGSI_OPCODE_PK4UB 43
+ /* gap */
#define TGSI_OPCODE_RFL 44
#define TGSI_OPCODE_SEQ 45
#define TGSI_OPCODE_SFL 46
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
