From: Christian König Date: Sun, 22 May 2011 16:28:09 +0000 (+0200) Subject: r600g: revert commit 36b322dffd2429130f132f55f68acb1a23ba1658 for now X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5705fb1dca061b097e568687101af396ec9e8d4c;p=mesa.git r600g: revert commit 36b322dffd2429130f132f55f68acb1a23ba1658 for now Disable scaled textures, since they didn't work 100% right now. --- diff --git a/src/gallium/drivers/r600/r600_state_inlines.h b/src/gallium/drivers/r600/r600_state_inlines.h index 39c647835a6..3254012ddf5 100644 --- a/src/gallium/drivers/r600/r600_state_inlines.h +++ b/src/gallium/drivers/r600/r600_state_inlines.h @@ -372,7 +372,6 @@ static inline uint32_t r600_translate_colorswap(enum pipe_format format) case PIPE_FORMAT_R32G32_FLOAT: case PIPE_FORMAT_R16G16B16A16_UNORM: case PIPE_FORMAT_R16G16B16A16_SNORM: - case PIPE_FORMAT_R16G16B16A16_SSCALED: case PIPE_FORMAT_R16G16B16A16_FLOAT: /* 128-bit buffers. */ @@ -473,7 +472,6 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_R16G16B16_USCALED: case PIPE_FORMAT_R16G16B16A16_USCALED: case PIPE_FORMAT_R16G16B16_SSCALED: - case PIPE_FORMAT_R16G16B16A16_SSCALED: case PIPE_FORMAT_R16G16B16A16_UNORM: case PIPE_FORMAT_R16G16B16A16_SNORM: return V_0280A0_COLOR_16_16_16_16;