mesa: standardize on C99's uint*_t instead of u_int*_t

[mesa.git] / src / mesa / drivers / dri / ffb / ffb_span.c

diff --git a/src/mesa/drivers/dri/ffb/ffb_span.c b/src/mesa/drivers/dri/ffb/ffb_span.c
index f4698c64e4a65104fd4938da6e6220147b0ffff7..0798fcf3524f734b525c0eaabac76b69d1e9cfb8 100644 (file)
--- a/src/mesa/drivers/dri/ffb/ffb_span.c
+++ b/src/mesa/drivers/dri/ffb/ffb_span.c
@@ -25,7 +25,7 @@
  *    David S. Miller <davem@redhat.com>
  */
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "ffb_dd.h"
 #include "ffb_span.h"
 #include "ffb_context.h"
@@ -93,7 +93,7 @@ do {  unsigned int fbc, ppc, cmp;                                     \
        fmesa->ffbScreen->rp_active = 1; \
 } while(0)
 
-#define Y_FLIP(__y)            (height - __y)
+#define Y_FLIP(__y)            (height - __y - 1)
 
 #define READ_RGBA(rgba,__x,__y)                                        \
 do {   GLuint p = *(GLuint *)(buf + ((__x)<<2) + ((__y)<<13)); \
@@ -114,7 +114,7 @@ do {        GLuint p = *(GLuint *)(buf + ((__x)<<2) + ((__y)<<13)); \
 
 #define TAG(x) ffb##x##_888
 
-#include <spantmp.h>
+#include "spantmp.h"
 
 /**
  * Plug in the Get/Put routines for the given driRenderbuffer.
@@ -125,11 +125,5 @@ ffbSetSpanFunctions(driRenderbuffer *drb, const GLvisual *vis)
        assert(vis->redBits == 8);
         assert(vis->greenBits == 8);
         assert(vis->blueBits == 8);
-        drb->Base.GetRow        = ffbReadRGBASpan_888;
-        drb->Base.GetValues     = ffbReadRGBAPixels_888;
-        drb->Base.PutRow        = ffbWriteRGBASpan_888;
-        drb->Base.PutRowRGB     = ffbWriteRGBSpan_888;
-        drb->Base.PutMonoRow    = ffbWriteMonoRGBASpan_888;
-        drb->Base.PutValues     = ffbWriteRGBAPixels_888;
-        drb->Base.PutMonoValues = ffbWriteMonoRGBAPixels_888;
+        ffbInitPointers_888(&drb->Base);
 }