diff options
| author | Corbin Simpson <MostAwesomeDude@gmail.com> | 2008-08-30 11:15:20 -0700 |
|---|---|---|
| committer | Pierre Ossman <pierre@ossman.eu> | 2008-12-01 19:21:54 +0100 |
| commit | 36a62b8c47def3f23a0b735875f59d23ed3c095a (patch) | |
| tree | cccea25e8b8e70f21dca29c4882e8049e0fa853a /src | |
| parent | 01ed5462fad56f5b7bf867041d00443bdf81c653 (diff) | |
r3xx: Various Xv fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_textured_video.c | 11 | ||||
| -rw-r--r-- | src/radeon_textured_videofuncs.c | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c index c7d06202..318df492 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -230,7 +230,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, } /* Bicubic filter loading */ - if (!IS_R500_3D && !IS_R300_3D) + if (!(IS_R300_3D || IS_R500_3D)) pPriv->bicubic_enabled = FALSE; if (pPriv->bicubic_memory == NULL && pPriv->bicubic_enabled) { pPriv->bicubic_offset = radeon_legacy_allocate_memory(pScrn, @@ -457,13 +457,8 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen) pPortPriv = (RADEONPortPrivPtr)(&adapt->pPortPrivates[num_texture_ports]); - if (IS_R500_3D) { - adapt->nAttributes = NUM_ATTRIBUTES; - adapt->pAttributes = Attributes; - } else { - adapt->nAttributes = 0; - adapt->pAttributes = NULL; - } + adapt->pAttributes = Attributes; + adapt->nAttributes = NUM_ATTRIBUTES; adapt->pImages = Images; adapt->nImages = NUM_IMAGES; adapt->PutVideo = NULL; diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c index 8c90f418..3292ccad 100644 --- a/src/radeon_textured_videofuncs.c +++ b/src/radeon_textured_videofuncs.c @@ -681,9 +681,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv OUT_ACCEL_REG(R300_US_ALU_CONST_B(1), 0); OUT_ACCEL_REG(R300_US_ALU_CONST_A(1), 0); - FINISH_VIDEO(); + FINISH_ACCEL(); } else { - BEGIN_VIDEO(8); + BEGIN_ACCEL(8); /* 2 components: 2 for tex0 */ OUT_ACCEL_REG(R300_RS_COUNT, ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) | |