Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / drivers / r600 / r600_state_inlines.h

diff --git a/src/gallium/drivers/r600/r600_state_inlines.h b/src/gallium/drivers/r600/r600_state_inlines.h
index 5d6145661a060095eeb8153ae37ac36937dff812..5eabfdc2bc60b022572a600d32da5d663325d917 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_inlines.h
+++ b/src/gallium/drivers/r600/r600_state_inlines.h
@@ -319,6 +319,7 @@ static inline uint32_t r600_translate_colorswap(enum pipe_format format)
                return V_0280A0_SWAP_STD;
 
        case PIPE_FORMAT_R16_UNORM:
+       case PIPE_FORMAT_R16_SNORM:
                return V_0280A0_SWAP_STD;
 
                /* 32-bit buffers. */
@@ -370,6 +371,7 @@ 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. */
@@ -420,6 +422,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
                return V_0280A0_COLOR_8_8;
 
        case PIPE_FORMAT_R16_UNORM:
+       case PIPE_FORMAT_R16_SNORM:
                return V_0280A0_COLOR_16;
 
                /* 32-bit buffers. */
@@ -452,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;