initial support for PIPE_FORMAT_Z24_S8

3 files changed, 22 insertions, 4 deletions

diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index 3e591170da..219a5afcbd 100644
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -91,6 +91,8 @@ depth_value(GLuint pipeFormat, GLfloat value)
          return (uint) (value * 0xffffffff);
    case PIPE_FORMAT_S8_Z24:
       return (uint) (value * 0xffffff);
+   case PIPE_FORMAT_Z24_S8:
+      return ((uint) (value * 0xffffff)) << 8;
    default:
       assert(0);
       return 0;
@@ -103,7 +105,7 @@ is_depth_stencil_format(GLuint pipeFormat)
 {
    switch (pipeFormat) {
    case PIPE_FORMAT_S8_Z24:
-   /*case PIPE_FORMAT_Z24_S8:*/
+   case PIPE_FORMAT_Z24_S8:
       return GL_TRUE;
    default:
       return GL_FALSE;
@@ -521,11 +523,9 @@ clear_depth_stencil_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
       case PIPE_FORMAT_S8_Z24:
          clearValue |= ctx->Stencil.Clear << 24;
          break;
-#if 0
       case PIPE_FORMAT_Z24_S8:
-         clearValue = (clearValue << 8) | clearVal;
+         clearValue |= clearValue | ctx->Stencil.Clear;
          break;
-#endif
       default:
          assert(0);
       }  
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index c347a0b688..2e7c01672a 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -100,6 +100,15 @@ st_read_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
             }
          }
          break;
+      case PIPE_FORMAT_Z24_S8:
+         {
+            const uint *src = (uint *) stmap + srcY * ps->region->pitch + x;
+            GLint k;
+            for (k = 0; k < width; k++) {
+               values[k] = src[k] & 0xff;
+            }
+         }
+         break;
       default:
          assert(0);
       }
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index ddba650941..c6b5bc968f 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -320,6 +320,9 @@ default_depth_format(
    if (pipe->is_format_supported( pipe, PIPE_FORMAT_S8_Z24 )) {
       return PIPE_FORMAT_S8_Z24;
    }
+   if (pipe->is_format_supported( pipe, PIPE_FORMAT_Z24_S8 )) {
+      return PIPE_FORMAT_Z24_S8;
+   }
    return PIPE_FORMAT_NONE;
 }
 
@@ -486,6 +489,8 @@ st_choose_pipe_format(struct pipe_context *pipe, GLint internalFormat,
    case GL_DEPTH_COMPONENT24:
       if (pipe->is_format_supported( pipe, PIPE_FORMAT_S8_Z24 ))
          return PIPE_FORMAT_S8_Z24;
+      if (pipe->is_format_supported( pipe, PIPE_FORMAT_Z24_S8 ))
+         return PIPE_FORMAT_Z24_S8;
       /* fall-through */
    case GL_DEPTH_COMPONENT32:
       if (pipe->is_format_supported( pipe, PIPE_FORMAT_U_Z32 ))
@@ -503,12 +508,16 @@ st_choose_pipe_format(struct pipe_context *pipe, GLint internalFormat,
          return PIPE_FORMAT_U_S8;
       if (pipe->is_format_supported( pipe, PIPE_FORMAT_S8_Z24 ))
          return PIPE_FORMAT_S8_Z24;
+      if (pipe->is_format_supported( pipe, PIPE_FORMAT_Z24_S8 ))
+         return PIPE_FORMAT_Z24_S8;
       return PIPE_FORMAT_NONE;
 
    case GL_DEPTH_STENCIL_EXT:
    case GL_DEPTH24_STENCIL8_EXT:
       if (pipe->is_format_supported( pipe, PIPE_FORMAT_S8_Z24 ))
          return PIPE_FORMAT_S8_Z24;
+      if (pipe->is_format_supported( pipe, PIPE_FORMAT_Z24_S8 ))
+         return PIPE_FORMAT_Z24_S8;
       return PIPE_FORMAT_NONE;
 
    default: