diff options
| author | Christian König <[email protected]> | 2011-06-05 00:59:58 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-06-05 00:59:58 +0200 |
| commit | 129a3c1cf0f9174d32db022b970ffb2127450ff9 (patch) | |
| tree | c568549be765fdc5cddb50306d6232ff35cd083d /src/gallium/drivers | |
| parent | 1eb957bb4108123bea95b818e0544e3b5f255e08 (diff) | |
r600g: some merge fixes
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r600/eg_state_inlines.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_inlines.h | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/eg_state_inlines.h b/src/gallium/drivers/r600/eg_state_inlines.h index a2ba73febdd..b780dba3e33 100644 --- a/src/gallium/drivers/r600/eg_state_inlines.h +++ b/src/gallium/drivers/r600/eg_state_inlines.h @@ -377,7 +377,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. */ diff --git a/src/gallium/drivers/r600/r600_state_inlines.h b/src/gallium/drivers/r600/r600_state_inlines.h index 3254012ddf5..acd41a21214 100644 --- a/src/gallium/drivers/r600/r600_state_inlines.h +++ b/src/gallium/drivers/r600/r600_state_inlines.h @@ -455,8 +455,8 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_S8_USCALED_Z24_UNORM: return V_0280A0_COLOR_24_8; - //case PIPE_FORMAT_R32_FLOAT: - // return V_0280A0_COLOR_32_FLOAT; + case PIPE_FORMAT_R32_FLOAT: + return V_0280A0_COLOR_32_FLOAT; case PIPE_FORMAT_R16G16_FLOAT: return V_0280A0_COLOR_16_16_FLOAT; @@ -472,6 +472,7 @@ 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; |