Merge remote branch 'origin/mesa_7_6_branch'

[mesa.git] / src / mesa / drivers / dri / gamma / gamma_span.c

diff --git a/src/mesa/drivers/dri/gamma/gamma_span.c b/src/mesa/drivers/dri/gamma/gamma_span.c
index 66cc961c64f90d7de4aa6c4c967b86e7ed6e8580..cdaaac3f3ac36ca6edc684c06d04f29561558a82 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_span.c
+++ b/src/mesa/drivers/dri/gamma/gamma_span.c
@@ -1,6 +1,5 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_span.c,v 1.4 2002/11/05 17:46:07 tsi Exp $ */
 
-#include "gamma_context.h"
+#include "gammacontext.h"
 #include "gamma_lock.h"
 #include "colormac.h"
 
@@ -19,12 +18,8 @@
                        gmesa->drawOffset +                             \
                        (dPriv->x * gammascrn->cpp) +                   \
                        (dPriv->y * pitch));                            \
-   char *read_buf = (char *)(sPriv->pFB +                              \
-                            gmesa->readOffset +                        \
-                            (dPriv->x * gammascrn->cpp) +              \
-                            (dPriv->y * pitch));                       \
    GLuint p;                                                           \
-   (void) read_buf; (void) buf; (void) p
+   (void) buf; (void) p
 
 /* FIXME! Depth/Stencil read/writes don't work ! */
 #define LOCAL_DEPTH_VARS                               \
@@ -71,7 +66,7 @@
 
 #define READ_RGBA( rgba, _x, _y )                                      \
    do {                                                                        \
-      GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch);          \
+      GLushort p = *(GLushort *)(buf + _x*2 + _y*pitch);               \
       rgba[0] = (p >> 8) & 0xf8;                                       \
       rgba[1] = (p >> 3) & 0xfc;                                       \
       rgba[2] = (p << 3) & 0xf8;                                       \
@@ -103,7 +98,7 @@
 
 #define READ_RGBA( rgba, _x, _y )                                      \
 do {                                                                   \
-   GLuint p = *(GLuint *)(read_buf + _x*4 + _y*pitch);                 \
+   GLuint p = *(GLuint *)(buf + _x*4 + _y*pitch);                      \
    rgba[0] = (p >> 16) & 0xff;                                         \
    rgba[1] = (p >>  8) & 0xff;                                         \
    rgba[2] = (p >>  0) & 0xff;                                         \
@@ -116,6 +111,8 @@ do {                                                                        \
 
 /* 16 bit depthbuffer functions.
  */
+#define VALUE_TYPE GLushort
+
 #define WRITE_DEPTH( _x, _y, d )       \
    *(GLushort *)(buf + (_x)*2 + (_y)*pitch) = d;
 
@@ -129,6 +126,8 @@ do {                                                                        \
 #if 0 /* Unused */
 /* 32 bit depthbuffer functions.
  */
+#define VALUE_TYPE GLuint
+
 #define WRITE_DEPTH( _x, _y, d )       \
    *(GLuint *)(buf + (_x)*4 + (_y)*pitch) = d;
 
@@ -142,6 +141,8 @@ do {                                                                        \
 
 /* 24/8 bit interleaved depth/stencil functions
  */
+#define VALUE_TYPE GLuint
+
 #define WRITE_DEPTH( _x, _y, d ) {                     \
    GLuint tmp = *(GLuint *)(buf + (_x)*4 + (_y)*pitch);        \
    tmp &= 0xff;                                                \
@@ -176,10 +177,10 @@ static void gammaReadRGBASpan8888( const GLcontext *ctx,
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
    gammaScreenPtr gammascrn = gmesa->gammaScreen;
-   u_int32_t dwords1, dwords2, i = 0;
+   uint32_t dwords1, dwords2, i = 0;
    char *src = (char *)rgba[0];
    GLuint read = n * gammascrn->cpp; /* Number of bytes we are expecting */
-   u_int32_t data;
+   uint32_t data;
 
    FLUSH_DMA_BUFFER(gmesa);
    CHECK_DMA_BUFFER(gmesa, 16);
@@ -201,8 +202,8 @@ static void gammaReadRGBASpan8888( const GLcontext *ctx,
 
 moredata:
 
-   dwords1 = *(volatile u_int32_t*)(void *)(((u_int8_t*)gammascrn->regions[0].map) + (GlintOutFIFOWords));
-   dwords2 = *(volatile u_int32_t*)(void *)(((u_int8_t*)gammascrn->regions[2].map) + (GlintOutFIFOWords));
+   dwords1 = *(volatile uint32_t*)(void *)(((uint8_t*)gammascrn->regions[0].map) + (GlintOutFIFOWords));
+   dwords2 = *(volatile uint32_t*)(void *)(((uint8_t*)gammascrn->regions[2].map) + (GlintOutFIFOWords));
 
    if (dwords1) {
        memcpy(src, (char*)gammascrn->regions[1].map + 0x1000, dwords1 << 2);