diff options
| author | Eric Anholt <eric@anholt.net> | 2008-06-18 14:07:38 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-18 14:07:38 -0700 |
| commit | 654258a4fe5e7114022c6e02f2844fc469fcc6f3 (patch) | |
| tree | 89d285becb87659ab61ee0ceeb35c76726ae93d2 /src/mesa/drivers/dri/i915 | |
| parent | 64adeb163d7da6d75b5664cd2ee3783cadaf63d8 (diff) | |
| parent | cf29ab3ba075905cca786b52617d7dc993f58033 (diff) | |
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_texstate.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c index 987c6c0454..af7166e681 100644 --- a/src/mesa/drivers/dri/i915/i915_texstate.c +++ b/src/mesa/drivers/dri/i915/i915_texstate.c @@ -65,7 +65,12 @@ translate_texture_format(GLuint mesa_format, GLenum DepthMode) case MESA_FORMAT_RGBA_FXT1: return (MAPSURF_COMPRESSED | MT_COMPRESS_FXT1); case MESA_FORMAT_Z16: - return (MAPSURF_16BIT | (DepthMode==GL_ALPHA?MT_16BIT_A16:MT_16BIT_L16)); + if (DepthMode == GL_ALPHA) + return (MAPSURF_16BIT | MT_16BIT_A16); + else if (DepthMode == GL_INTENSITY) + return (MAPSURF_16BIT | MT_16BIT_I16); + else + return (MAPSURF_16BIT | MT_16BIT_L16); case MESA_FORMAT_RGBA_DXT1: case MESA_FORMAT_RGB_DXT1: return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT1); |