Merge branch 'gallium-0.1' into gallium-tex-surfaces

2008-05-18 16:17:50 -06:00
parent b4219e35e2 a0bfeb0c3c
commit 54fbd8bbd4
76 changed files with 2754 additions and 3226 deletions
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -92,7 +92,7 @@ st_read_stencil_pixels(GLcontext *ctx, GLint x, GLint y,

      /* get stencil values */
      switch (ps->format) {
-      case PIPE_FORMAT_U_S8:
+      case PIPE_FORMAT_S8_UNORM:
         {
            const ubyte *src = stmap + srcY * ps->pitch + x;
            memcpy(values, src, width);