summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-08-24 18:26:42 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-08-24 18:26:42 -0600
commit703140bbd58931046c00b43e52a7c4e9235875ca (patch)
treee5c3a02e0958c5b617ab8006aa85b5e9621d4133 /src
parent29dc25bcfebfcb1764382bee960851ab051e6bbe (diff)
Fix fragment program color output mapping (0=depth, 1=color)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/pipe/i915simple/i915_fpc_translate.c6
-rwxr-xr-xsrc/mesa/pipe/softpipe/sp_quad_fs.c4
-rw-r--r--src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/pipe/i915simple/i915_fpc_translate.c b/src/mesa/pipe/i915simple/i915_fpc_translate.c
index 6fcba719ae..c2ad80c5d0 100644
--- a/src/mesa/pipe/i915simple/i915_fpc_translate.c
+++ b/src/mesa/pipe/i915simple/i915_fpc_translate.c
@@ -237,10 +237,10 @@ get_result_vector(struct i915_fp_compile *p,
switch (dest->DstRegister.File) {
case TGSI_FILE_OUTPUT:
switch (dest->DstRegister.Index) {
- case TGSI_ATTRIB_COLOR0:
- return UREG(REG_TYPE_OC, 0);
- case TGSI_ATTRIB_POS:
+ case 0: /**TGSI_ATTRIB_POS:**/
return UREG(REG_TYPE_OD, 0);
+ case 1: /**TGSI_ATTRIB_COLOR0:**/
+ return UREG(REG_TYPE_OC, 0);
default:
i915_program_error(p, "Bad inst->DstReg.Index");
return 0;
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index bfc31f94a6..cb0b6d8a77 100755
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -136,10 +136,10 @@ shade_quad(
/* run shader */
tgsi_exec_machine_run( &machine );
- /* store result color */
+ /* store result color (always in output[1]) */
memcpy(
quad->outputs.color,
- &machine.Outputs[TGSI_ATTRIB_COLOR0].xyzw[0].f[0],
+ &machine.Outputs[1].xyzw[0].f[0],
sizeof( quad->outputs.color ) );
#if 0
diff --git a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
index 78390767df..182a7eff05 100644
--- a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
+++ b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
@@ -356,11 +356,11 @@ map_register_file_index(
* color results -> index 1, 2, ...
*/
if( index == FRAG_RESULT_DEPR ) {
- mapped_index = TGSI_ATTRIB_POS;
+ mapped_index = 0; /**TGSI_ATTRIB_POS;**/
}
else {
assert( index == FRAG_RESULT_COLR );
- mapped_index = TGSI_ATTRIB_COLOR0;
+ mapped_index = 1; /**TGSI_ATTRIB_COLOR0;**/
}
}
else {