i915: replace MESA_FORMAT_Z24_S8 with MESA_FORMAT_S8_Z24
authorBrian Paul <brianp@vmware.com>
Thu, 22 Oct 2009 03:47:58 +0000 (21:47 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 22 Oct 2009 03:48:03 +0000 (21:48 -0600)
And change parameter type.

src/mesa/drivers/dri/i915/i915_texstate.c

index e441e287eb5cf25090eed5d31dcf25facbb3f5b8..d6bfe5fc7f373b689156f7665f86705c315a2469 100644 (file)
@@ -36,7 +36,7 @@
 
 
 static GLuint
-translate_texture_format(GLuint mesa_format, GLuint internal_format,
+translate_texture_format(gl_format mesa_format, GLuint internal_format,
                         GLenum DepthMode)
 {
    switch (mesa_format) {
@@ -80,7 +80,7 @@ translate_texture_format(GLuint mesa_format, GLuint internal_format,
       return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT2_3);
    case MESA_FORMAT_RGBA_DXT5:
       return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT4_5);
-   case MESA_FORMAT_Z24_S8:
+   case MESA_FORMAT_S8_Z24:
       return (MAPSURF_32BIT | MT_32BIT_xI824);
    default:
       fprintf(stderr, "%s: bad image format %x\n", __FUNCTION__, mesa_format);