summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Ossman <pierre@ossman.eu>2008-12-03 19:31:31 +0100
committerPierre Ossman <pierre@ossman.eu>2008-12-03 19:31:31 +0100
commit8f4b22932c91f1d51fcbf1d1a99d852fcdaafdcc (patch)
tree72bf15333236d636e3f7ea7ba3304768d95c7a0a
parent0851daa6e7db77e440188d774ef8b3236146bcb9 (diff)
Now that we have a bicubic code path that messes up the pixel shader,
we need to restore it in the non-bicubic code.
-rw-r--r--src/radeon_textured_videofuncs.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index 4d34f8f6..284d8ce2 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -683,7 +683,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
FINISH_ACCEL();
} else {
- BEGIN_ACCEL(8);
+ BEGIN_ACCEL(11);
/* 2 components: 2 for tex0 */
OUT_ACCEL_REG(R300_RS_COUNT,
((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
@@ -693,6 +693,10 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
OUT_ACCEL_REG(R300_US_PIXSIZE, 0); /* highest temp used */
+ /* Indirection levels */
+ OUT_ACCEL_REG(R300_US_CONFIG, ((0 << R300_NLEVEL_SHIFT) |
+ R300_FIRST_TEX));
+
OUT_ACCEL_REG(R300_US_CODE_OFFSET, (R300_ALU_CODE_OFFSET(0) |
R300_ALU_CODE_SIZE(1) |
R300_TEX_CODE_OFFSET(0) |
@@ -704,7 +708,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
R300_TEX_SIZE(0) |
R300_RGBA_OUT));
- /* tex inst is preloaded in RADEONInit3DEngine() */
+ /* tex inst */
+ OUT_ACCEL_REG(R300_US_TEX_INST_0, (R300_TEX_SRC_ADDR(0) |
+ R300_TEX_DST_ADDR(0) |
+ R300_TEX_ID(0) |
+ R300_TEX_INST(R300_TEX_INST_LD)));
/* ALU inst */
/* RGB */