From: Brian Paul <brianp@vmware.com>
Date: Thu, 22 Oct 2009 03:47:58 +0000 (-0600)
Subject: i915: replace MESA_FORMAT_Z24_S8 with MESA_FORMAT_S8_Z24
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3c685608664900562919136fbc33ac16060a27c3;p=mesa.git

i915: replace MESA_FORMAT_Z24_S8 with MESA_FORMAT_S8_Z24

And change parameter type.
---

diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c
index e441e287eb5..d6bfe5fc7f3 100644
--- a/src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/src/mesa/drivers/dri/i915/i915_texstate.c
@@ -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);