diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2008-03-20 17:47:02 +0800 |
|---|---|---|
| committer | Zou Nan hai <nanhai.zou@intel.com> | 2008-03-20 17:47:02 +0800 |
| commit | 7233eabaf0072b7c50e4f26ec33738b5b89aad20 (patch) | |
| tree | 8c547c5410782fdf2180e44493fe6aeb1dce7d9c /src/mesa/drivers/dri/i915/i915_texstate.c | |
| parent | bff94a91c6852157a8251652cb61dc699cd8e4f1 (diff) | |
[i915] GL_DEPTH_TEXTURE_MODE fix
Diffstat (limited to 'src/mesa/drivers/dri/i915/i915_texstate.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_texstate.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c index ba42093287..133514d57d 100644 --- a/src/mesa/drivers/dri/i915/i915_texstate.c +++ b/src/mesa/drivers/dri/i915/i915_texstate.c @@ -38,7 +38,7 @@ static GLuint -translate_texture_format(GLuint mesa_format) +translate_texture_format(GLuint mesa_format, GLenum DepthMode) { switch (mesa_format) { case MESA_FORMAT_L8: @@ -65,7 +65,7 @@ translate_texture_format(GLuint mesa_format) case MESA_FORMAT_RGBA_FXT1: return (MAPSURF_COMPRESSED | MT_COMPRESS_FXT1); case MESA_FORMAT_Z16: - return (MAPSURF_16BIT | MT_16BIT_L16); + return (MAPSURF_16BIT | (DepthMode==GL_ALPHA?MT_16BIT_A16:MT_16BIT_L16)); case MESA_FORMAT_RGBA_DXT1: case MESA_FORMAT_RGB_DXT1: return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT1); @@ -166,7 +166,8 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3) 0, intelObj-> firstLevel); - format = translate_texture_format(firstImage->TexFormat->MesaFormat); + format = translate_texture_format(firstImage->TexFormat->MesaFormat, + tObj->DepthMode); pitch = intelObj->mt->pitch * intelObj->mt->cpp; } |