diff options
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_span.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_span.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_span.c b/src/mesa/drivers/dri/r200/r200_span.c index 8de41332e4..7cfed94771 100644 --- a/src/mesa/drivers/dri/r200/r200_span.c +++ b/src/mesa/drivers/dri/r200/r200_span.c @@ -46,9 +46,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define DBG 0 -#define GET_PTR(X,Y) (sPriv->pFB + drb->flippedOffset \ - + ((dPriv->y + (Y)) * drb->flippedPitch + (dPriv->x + (X))) * drb->cpp) - #define LOCAL_VARS \ r200ContextPtr rmesa = R200_CONTEXT(ctx); \ __DRIscreenPrivate *sPriv = rmesa->dri.screen; \ @@ -89,8 +86,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define TAG(x) r200##x##_RGB565 #define TAG2(x,y) r200##x##_RGB565##y -#define GET_SRC_PTR(X,Y) GET_PTR(X,Y) -#define GET_DST_PTR(X,Y) GET_PTR(X,Y) +#define GET_PTR(X,Y) (sPriv->pFB + drb->flippedOffset \ + + ((dPriv->y + (Y)) * drb->flippedPitch + (dPriv->x + (X))) * drb->cpp) #include "spantmp2.h" /* 32 bit, ARGB8888 color spanline and pixel functions @@ -100,8 +97,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define TAG(x) r200##x##_ARGB8888 #define TAG2(x,y) r200##x##_ARGB8888##y -#define GET_SRC_PTR(X,Y) GET_PTR(X,Y) -#define GET_DST_PTR(X,Y) GET_PTR(X,Y) +#define GET_PTR(X,Y) (sPriv->pFB + drb->flippedOffset \ + + ((dPriv->y + (Y)) * drb->flippedPitch + (dPriv->x + (X))) * drb->cpp) #include "spantmp2.h" @@ -259,10 +256,10 @@ static void r200SpanRenderStart( GLcontext *ctx ) int p; driRenderbuffer *drb = (driRenderbuffer *) ctx->WinSysDrawBuffer->_ColorDrawBuffers[0][0]; - volatile int *read_buf = + volatile int *buf = (volatile int *)(rmesa->dri.screen->pFB + drb->offset); - p = *read_buf; - *read_buf = p; + p = *buf; + *buf = p; } } |