Nobody ever set the flag, which makes this dead code.
v2: Leave the ureg_DECL_fs_input_cyl function in place, even though it's
unused, since VMWare uses it for their internal projects.
---
src/mesa/program/prog_parameter.h | 8 --------
src/mesa/state_tracker/st_mesa_to_tgsi.c | 17 ++++-------------
2 files changed, 4 insertions(+), 21 deletions(-)
Brian,
Does this work for you? I left the function, but still removed the bit.
I'd like to remove the bit since it's the last one in the bitfield (and
I doubt your DX9 code goes through the Mesa program stuff anyway?)
--Ken
diff --git a/src/mesa/program/prog_parameter.h
b/src/mesa/program/prog_parameter.h
index ef6731e..b12391f 100644
--- a/src/mesa/program/prog_parameter.h
+++ b/src/mesa/program/prog_parameter.h
@@ -41,14 +41,6 @@ extern "C" {
/**
- * Program parameter flags
- */
-/*@{*/
-#define PROG_PARAM_BIT_CYL_WRAP 0x10 /**< XXX gallium debug */
-/*@}*/
-
-
-/**
* Actual data for constant values of parameters.
*/
typedef union gl_constant_value
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c
b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index e49cd7f..6224dc5 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -1054,19 +1054,10 @@ st_translate_mesa_program(
*/
if (procType == TGSI_PROCESSOR_FRAGMENT) {
for (i = 0; i < numInputs; i++) {
- if (program->InputFlags[0] & PROG_PARAM_BIT_CYL_WRAP) {
- t->inputs[i] = ureg_DECL_fs_input_cyl(ureg,
- inputSemanticName[i],
- inputSemanticIndex[i],
- interpMode[i],
- TGSI_CYLINDRICAL_WRAP_X);
- }
- else {
- t->inputs[i] = ureg_DECL_fs_input(ureg,
- inputSemanticName[i],
- inputSemanticIndex[i],
- interpMode[i]);
- }
+ t->inputs[i] = ureg_DECL_fs_input(ureg,
+ inputSemanticName[i],
+ inputSemanticIndex[i],
+ interpMode[i]);
}
if (program->InputsRead & FRAG_BIT_WPOS) {
--
1.7.12.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
