fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-13 19:40:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r5xx: Fix dumb shader.

Browse source 
For some reason, FGLRX doesn't actually set R500_US_INST_TEX.
Let us not make that same mistake.
This commit is contained in:
Corbin Simpson 2008-05-03 09:08:07 -07:00
parent 0f07e0aea3
commit 4ef195a369
1 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/mesa/drivers/dri/r300/r500_fragprog.c
View file

@ -67,6 +67,8 @@
/* "Register" flags */
#define REG_CONSTANT (1 << 8)
#define REG_SRC_REL (1 << 9)
#define REG_DEST_REL (1 << 7)
/* Swizzle tools */
#define R500_SWIZZLE_ZERO 4
@ -187,26 +189,36 @@ static GLuint make_dest(struct r500_fragment_program *fp, struct prog_dst_regist
static void dumb_shader(struct r500_fragment_program *fp)
{
/* R500_INST_TYPE_TEX? */
fp->inst[0].inst0 = 0x7808;
fp->inst[0].inst1 = R500_TEX_ID(0) | R500_TEX_INST_LD | R500_TEX_SEM_ACQUIRE | R500_TEX_IGNORE_UNCOVERED;
fp->inst[0].inst2 = R500_TEX_SRC_ADDR(0) | R500_TEX_SRC_S_SWIZ_R |
R500_TEX_SRC_T_SWIZ_G |
R500_TEX_DST_ADDR(0) |
R500_TEX_DST_R_SWIZ_R |
R500_TEX_DST_G_SWIZ_G |
R500_TEX_DST_B_SWIZ_B |
R500_TEX_DST_A_SWIZ_A;
fp->inst[0].inst3 = R500_DX_ADDR(0) |
R500_DX_S_SWIZ_R |
R500_DX_T_SWIZ_R |
R500_DX_R_SWIZ_R |
R500_DX_Q_SWIZ_R |
R500_DY_ADDR(0) |
R500_DY_S_SWIZ_R |
R500_DY_T_SWIZ_R |
R500_DY_R_SWIZ_R |
R500_DY_Q_SWIZ_R;
fp->inst[0].inst0 = R500_INST_TYPE_TEX
| R500_INST_TEX_SEM_WAIT
| R500_INST_RGB_WMASK_R
| R500_INST_RGB_WMASK_G
| R500_INST_RGB_WMASK_B
| R500_INST_ALPHA_WMASK
| R500_INST_RGB_CLAMP
| R500_INST_ALPHA_CLAMP;
fp->inst[0].inst1 = R500_TEX_ID(0)
| R500_TEX_INST_LD
| R500_TEX_SEM_ACQUIRE
| R500_TEX_IGNORE_UNCOVERED;
fp->inst[0].inst2 = R500_TEX_SRC_ADDR(0)
| R500_TEX_SRC_S_SWIZ_R
| R500_TEX_SRC_T_SWIZ_G
| R500_TEX_DST_ADDR(0)
| R500_TEX_DST_R_SWIZ_R
| R500_TEX_DST_G_SWIZ_G
| R500_TEX_DST_B_SWIZ_B
| R500_TEX_DST_A_SWIZ_A;
fp->inst[0].inst3 = R500_DX_ADDR(0)
| R500_DX_S_SWIZ_R
| R500_DX_T_SWIZ_R
| R500_DX_R_SWIZ_R
| R500_DX_Q_SWIZ_R
| R500_DY_ADDR(0)
| R500_DY_S_SWIZ_R
| R500_DY_T_SWIZ_R
| R500_DY_R_SWIZ_R
| R500_DY_Q_SWIZ_R;
fp->inst[0].inst4 = 0x0;
fp->inst[0].inst5 = 0x0;