diff options
author | Dave Airlie <airlied@redhat.com> | 2009-03-31 10:36:06 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-03-31 10:36:06 +1000 |
commit | e1d16574932be24da573a93e3302418dc6e855f1 (patch) | |
tree | ec501d000ae0f427f1a2834e14ac5e313cc31ee5 /src/mesa/drivers/dri/radeon/radeon_texture.c | |
parent | 1570bde279362d95a58d120e42e68cb307d00dde (diff) |
radeon/r200: fix glean failures on readPixSanity since EXT_DEPTH_STENCIL support
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_texture.c')
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texture.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index a38d76ac2c..5808633b7b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -458,25 +458,13 @@ const struct gl_texture_format *radeonChooseTextureFormat(GLcontext * ctx, case GL_DEPTH_COMPONENT16: case GL_DEPTH_COMPONENT24: case GL_DEPTH_COMPONENT32: -#if 0 - switch (type) { - case GL_UNSIGNED_BYTE: - case GL_UNSIGNED_SHORT: - return &_mesa_texformat_z16; - case GL_UNSIGNED_INT: - return &_mesa_texformat_z32; - case GL_UNSIGNED_INT_24_8_EXT: - default: - return &_mesa_texformat_z24_s8; - } -#else - return &_mesa_texformat_z16; -#endif - + case GL_DEPTH_STENCIL_EXT: + case GL_DEPTH24_STENCIL8_EXT: + return &_mesa_texformat_s8_z24; default: _mesa_problem(ctx, - "unexpected internalFormat 0x%x in r300ChooseTextureFormat", - (int)internalFormat); + "unexpected internalFormat 0x%x in %s", + (int)internalFormat, __func__); return NULL; } |