s/PIPE_FORMAT_U_S8/PIPE_FORMAT_S8_UNORM/

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 65bfd6cfcc01499d30ebc3b1d618ca572d2076cb..56b949cf9609801d9a4ff1cc37e9837eac6520d3 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -770,7 +770,7 @@ draw_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
             }
 
             switch (ps->format) {
-            case PIPE_FORMAT_U_S8:
+            case PIPE_FORMAT_S8_UNORM:
                {
                   ubyte *dest = stmap + spanY * ps->pitch + spanX;
                   memcpy(dest, values, spanWidth);
@@ -914,7 +914,7 @@ copy_stencil_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
             }
          }
          break;
-      case PIPE_FORMAT_U_S8:
+      case PIPE_FORMAT_S8_UNORM:
          memcpy(dst, src, width);
          break;
       default:

diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index ddbe36106c86367c4478eeb59b7c5073f71b662d..745755566e7e312f19d3438599e4961bb3b3e516 100644 (file)
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -87,7 +87,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);

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 9a385a0457983fd7c508e17e5f5a950527636a75..17a3cfd5a466357f8d3be741a35843ea60f6729f 100644 (file)
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -503,8 +503,8 @@ st_choose_format(struct pipe_context *pipe, GLint internalFormat,
    case GL_STENCIL_INDEX4_EXT:
    case GL_STENCIL_INDEX8_EXT:
    case GL_STENCIL_INDEX16_EXT:
-      if (screen->is_format_supported( screen, PIPE_FORMAT_U_S8, surfType ))
-         return PIPE_FORMAT_U_S8;
+      if (screen->is_format_supported( screen, PIPE_FORMAT_S8_UNORM, surfType ))
+         return PIPE_FORMAT_S8_UNORM;
       if (screen->is_format_supported( screen, PIPE_FORMAT_S8Z24_UNORM, surfType ))
          return PIPE_FORMAT_S8Z24_UNORM;
       if (screen->is_format_supported( screen, PIPE_FORMAT_Z24S8_UNORM, surfType ))