summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-02-18 20:21:13 -0500
committerAlex Deucher <alexdeucher@gmail.com>2009-02-18 20:21:13 -0500
commite6475282486f4895bc68f6b093ecbb1aa6d25f72 (patch)
tree23eb0afb8408df634e8d93070b21c0dec841e03d
parentadff8906c9899dde7711382577a63f4a726437ca (diff)
R6xx/R7xx Xv: fix some missing bits from last commit
-rw-r--r--src/r600_textured_videofuncs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
index c2b0e753..f03fb7df 100644
--- a/src/r600_textured_videofuncs.c
+++ b/src/r600_textured_videofuncs.c
@@ -44,7 +44,7 @@
#include "damage.h"
-void
+static void
R600DoneTexturedVideo(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
@@ -462,7 +462,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
while (nBox--) {
int srcX, srcY, srcw, srch;
int dstX, dstY, dstw, dsth;
- struct r6xx_copy_vertex *xv_vb = (pointer)((char*)accel_state->ib->address + (accel_state->ib->total / 2));
+ struct r6xx_copy_vertex *xv_vb;
struct r6xx_copy_vertex vertex[3];
if (((accel_state->vb_index + 3) * 16) > (accel_state->ib->total / 2)) {
@@ -471,6 +471,8 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
accel_state->ib = RADEONCPGetBuffer(pScrn);
}
+ xv_vb = (pointer)((char*)accel_state->ib->address + (accel_state->ib->total / 2));
+
dstX = pBox->x1 + dstxoff;
dstY = pBox->y1 + dstyoff;
dstw = pBox->x2 - pBox->x1;