diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2009-01-07 13:08:00 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2009-01-07 13:08:28 +1100 |
| commit | 0d72b551895ba09cae16d12e6b30e5a8b55c7425 (patch) | |
| tree | 8d6fab290bf0c056f98aa03c718794d884c1d9ff | |
| parent | afb2a170a830312029a507ed7c38387dd037c845 (diff) | |
| download | xorg-driver-xf86-video-nouveau-0d72b551895ba09cae16d12e6b30e5a8b55c7425.tar.gz | |
nv50/exa: move vertex begin()/end() out of prepare()/done() composite
| -rw-r--r-- | src/nv50_exa.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nv50_exa.c b/src/nv50_exa.c index fc6af10..4e0c5aa 100644 --- a/src/nv50_exa.c +++ b/src/nv50_exa.c @@ -702,9 +702,6 @@ NV50EXAPrepareComposite(int op, BEGIN_RING(chan, tesla, 0x1458, 1); OUT_RING (chan, 0x203); - BEGIN_RING(chan, tesla, NV50TCL_VERTEX_BEGIN, 1); - OUT_RING (chan, NV50TCL_VERTEX_BEGIN_QUADS); - return TRUE; } @@ -750,6 +747,9 @@ NV50EXAComposite(PixmapPtr pdpix, int sx, int sy, int mx, int my, state->unit[0].width, state->unit[0].height, &sX3, &sY3); + BEGIN_RING(chan, tesla, NV50TCL_VERTEX_BEGIN, 1); + OUT_RING (chan, NV50TCL_VERTEX_BEGIN_QUADS); + if (state->have_mask) { float mX0, mX1, mX2, mX3, mY0, mY1, mY2, mY3; @@ -776,6 +776,9 @@ NV50EXAComposite(PixmapPtr pdpix, int sx, int sy, int mx, int my, VTX1s(pNv, sX2, sY2, dX1, dY1); VTX1s(pNv, sX3, sY3, dX0, dY1); } + + BEGIN_RING(chan, tesla, NV50TCL_VERTEX_END, 1); + OUT_RING (chan, 0); } void @@ -783,7 +786,5 @@ NV50EXADoneComposite(PixmapPtr pdpix) { NV50EXA_LOCALS(pdpix); - BEGIN_RING(chan, tesla, NV50TCL_VERTEX_END, 1); - OUT_RING (chan, 0); } |