added a get_tile() func

diff --git a/src/mesa/pipe/softpipe/sp_surface.c b/src/mesa/pipe/softpipe/sp_surface.c
index 6512f1d78936691e967adaa9e704f7e0c9ffd2f1..87bb64af1a026a6b15914a913b88f21adf7f2820 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_surface.c
+++ b/src/mesa/pipe/softpipe/sp_surface.c
@@ -30,6 +30,7 @@
 #include "sp_surface.h"
 #include "pipe/p_defines.h"
 #include "main/imports.h"
+#include "main/macros.h"
 
 
 /**
@@ -315,6 +316,23 @@ s8_write_quad_stencil(struct softpipe_surface *sps,
 
 
 
+static void
+a8r8g8b8_get_tile(struct pipe_surface *ps,
+                  GLuint x, GLuint y, GLuint w, GLuint h, GLfloat *p)
+{
+   const GLuint *src
+      = ((const GLuint *) ps->region->map) + y * ps->region->pitch + x;
+   assert(w == 1);
+   assert(h == 1);
+   p[0] = UBYTE_TO_FLOAT((src[0] >> 16) & 0xff);
+   p[1] = UBYTE_TO_FLOAT((src[0] >>  8) & 0xff);
+   p[2] = UBYTE_TO_FLOAT((src[0] >>  0) & 0xff);
+   p[3] = UBYTE_TO_FLOAT((src[0] >> 24) & 0xff);
+}
+
+
+
+
 static void
 init_quad_funcs(struct softpipe_surface *sps)
 {
@@ -337,8 +355,14 @@ init_quad_funcs(struct softpipe_surface *sps)
       sps->read_quad_stencil = s8_read_quad_stencil;
       sps->write_quad_stencil = s8_write_quad_stencil;
       break;
+   case PIPE_FORMAT_U_A8_R8_G8_B8:
+      sps->surface.get_tile = a8r8g8b8_get_tile;
+      break;
    default:
+      /*
       assert(0);
+      */
+      ;
    }
 }
 
@@ -386,7 +410,7 @@ softpipe_get_tex_surface(struct pipe_context *pipe,
       assert(zslice == 0);
    }
 
-   ps = pipe->surface_alloc(pipe, mt->internal_format);
+   ps = pipe->surface_alloc(pipe, mt->format);
    if (ps) {
       assert(ps->format);
       assert(ps->refcount);