summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-01-17 17:20:46 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-01-17 17:20:46 +0900
commit25e2b8d669e01aac551276af7f34d8708d8cb9d0 (patch)
treec7a8b74bcd38ae13640560bad0b8cc1d72338295 /src
parent271f9dac79a9247de9a57f4d248e404bf1652a13 (diff)
Revert "temporarily don't emit TGSI immediates, use the constant buffer"
This reverts commit 310e7ca44b33558a9aa22f43024d1bfb63642128.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_mesa_to_tgsi.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 936ba9ed85..325aa20173 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -41,7 +41,6 @@
#define TGSI_DEBUG 0
-#define EMIT_IMMEDIATES 0
/*
* Map mesa register file to TGSI register file.
@@ -69,17 +68,12 @@ map_register_file(
case PROGRAM_STATE_VAR:
case PROGRAM_NAMED_PARAM:
case PROGRAM_UNIFORM:
- if (immediateMapping[index] != ~0) {
+ if (immediateMapping[index] != ~0)
return TGSI_FILE_IMMEDIATE;
- }
else
return TGSI_FILE_CONSTANT;
case PROGRAM_CONSTANT:
-#if EMIT_IMMEDIATES
return TGSI_FILE_IMMEDIATE;
-#else
- return TGSI_FILE_CONSTANT;
-#endif
case PROGRAM_INPUT:
return TGSI_FILE_INPUT;
case PROGRAM_OUTPUT:
@@ -834,7 +828,7 @@ tgsi_translate_mesa_program(
/* immediates/literals */
memset(immediates, ~0, sizeof(immediates));
-#if EMIT_IMMEDIATES
+
for (i = 0; program->Parameters && i < program->Parameters->NumParameters;
i++) {
if (program->Parameters->Parameters[i].Type == PROGRAM_CONSTANT) {
@@ -849,7 +843,6 @@ tgsi_translate_mesa_program(
numImmediates++;
}
}
-#endif
/* constant buffer refs */
{