diff options
| author | Eric Anholt <[email protected]> | 2011-10-20 15:15:34 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-10-28 11:21:38 -0700 |
| commit | 3996ed555e0a024051e4d161c8d31b2530d8cdc5 (patch) | |
| tree | 9b5dda39f9f96037bfa9db87a79cbe0249e8e2a6 /src/mesa/drivers/dri/radeon/radeon_texture.c | |
| parent | b300d62617839a4bb6fca60125e914f8919e8e69 (diff) | |
radeon: Unifdef RADEON_R300 and RADEON_R600.
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_texture.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texture.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index 557d6d457dc..1a1161e4cce 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -578,19 +578,6 @@ gl_format radeonChooseTextureFormat(struct gl_context * ctx, case GL_RGBA32F_ARB: return MESA_FORMAT_RGBA_FLOAT32; -#ifdef RADEON_R300 - case GL_DEPTH_COMPONENT: - case GL_DEPTH_COMPONENT16: - return MESA_FORMAT_Z16; - case GL_DEPTH_COMPONENT24: - case GL_DEPTH_COMPONENT32: - case GL_DEPTH_STENCIL_EXT: - case GL_DEPTH24_STENCIL8_EXT: - if (rmesa->radeonScreen->chip_family >= CHIP_FAMILY_RV515) - return MESA_FORMAT_S8_Z24; - else - return MESA_FORMAT_Z16; -#else case GL_DEPTH_COMPONENT: case GL_DEPTH_COMPONENT16: case GL_DEPTH_COMPONENT24: @@ -598,7 +585,6 @@ gl_format radeonChooseTextureFormat(struct gl_context * ctx, case GL_DEPTH_STENCIL_EXT: case GL_DEPTH24_STENCIL8_EXT: return MESA_FORMAT_S8_Z24; -#endif /* EXT_texture_sRGB */ case GL_SRGB: |