From 0cfd4f92dde078bcc9f458ede91cc341a7b0ef5b Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 4 Sep 2005 15:02:48 +0000 Subject: replace GET_SRC_PTR, GET_DST_PTR with GET_PTR --- src/mesa/drivers/dri/mach64/mach64_span.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers/dri/mach64') diff --git a/src/mesa/drivers/dri/mach64/mach64_span.c b/src/mesa/drivers/dri/mach64/mach64_span.c index dc9f27caee..3830a28165 100644 --- a/src/mesa/drivers/dri/mach64/mach64_span.c +++ b/src/mesa/drivers/dri/mach64/mach64_span.c @@ -38,9 +38,6 @@ #define DBG 0 -#define GET_PTR(X,Y) (sPriv->pFB + drb->offset \ - + ((dPriv->y + (Y)) * drb->pitch + (dPriv->x + (X))) * drb->cpp) - #define LOCAL_VARS \ mach64ContextPtr mmesa = MACH64_CONTEXT(ctx); \ __DRIscreenPrivate *sPriv = mmesa->driScreen; \ @@ -95,8 +92,8 @@ #define TAG(x) mach64##x##_RGB565 #define TAG2(x,y) mach64##x##_RGB565##y -#define GET_SRC_PTR(X,Y) GET_PTR(X,Y) -#define GET_DST_PTR(X,Y) GET_SRC_PTR(X,Y) +#define GET_PTR(X,Y) (sPriv->pFB + drb->offset \ + + ((dPriv->y + (Y)) * drb->pitch + (dPriv->x + (X))) * drb->cpp) #include "spantmp2.h" @@ -109,8 +106,8 @@ #define TAG(x) mach64##x##_ARGB8888 #define TAG2(x,y) mach64##x##_ARGB8888##y -#define GET_SRC_PTR(X,Y) GET_PTR(X,Y) -#define GET_DST_PTR(X,Y) GET_SRC_PTR(X,Y) +#define GET_PTR(X,Y) (sPriv->pFB + drb->offset \ + + ((dPriv->y + (Y)) * drb->pitch + (dPriv->x + (X))) * drb->cpp) #include "spantmp2.h" -- cgit v1.2.3