Merge remote-tracking 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 eb6fb6594b2d481450c920434cd0cd6d87e7e0e8..8711dbf1720f11350822f7c452332d701a7836b9 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:
        case PIPE_FORMAT_R16_FLOAT:
                return V_0280A0_SWAP_STD;
 
@@ -422,6 +423,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;
 
        case PIPE_FORMAT_R16_FLOAT: