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/r128/r128_span.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers/dri/r128/r128_span.c') diff --git a/src/mesa/drivers/dri/r128/r128_span.c b/src/mesa/drivers/dri/r128/r128_span.c index e64282b8a7..d204f4de92 100644 --- a/src/mesa/drivers/dri/r128/r128_span.c +++ b/src/mesa/drivers/dri/r128/r128_span.c @@ -44,9 +44,6 @@ 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 HAVE_HW_DEPTH_SPANS 1 #define HAVE_HW_DEPTH_PIXELS 1 @@ -88,8 +85,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #define TAG(x) r128##x##_RGB565 #define TAG2(x,y) r128##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" @@ -100,8 +97,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #define TAG(x) r128##x##_ARGB8888 #define TAG2(x,y) r128##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" -- cgit v1.2.3