r600g: some more vertex formats

diff --git a/src/gallium/drivers/r600/eg_state_inlines.h b/src/gallium/drivers/r600/eg_state_inlines.h
index d9897e020ec920908d95055985410e073bfe7ce1..4723aee5a5e171cb63a6ebac00014efc72b7f474 100644 (file)
--- a/src/gallium/drivers/r600/eg_state_inlines.h
+++ b/src/gallium/drivers/r600/eg_state_inlines.h
@@ -406,17 +406,17 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_R16G16_SSCALED:
                return V_028C70_COLOR_16_16;
 
-       case PIPE_FORMAT_R16G16B16_FLOAT:
-               return V_028C70_COLOR_16_16_16_16_FLOAT;
-
                /* 64-bit buffers. */
        case PIPE_FORMAT_R16G16B16A16_SSCALED:
        case PIPE_FORMAT_R16G16B16_SSCALED:
        case PIPE_FORMAT_R16G16B16A16_UNORM:
        case PIPE_FORMAT_R16G16B16A16_SNORM:
                return V_028C70_COLOR_16_16_16_16;
+
+       case PIPE_FORMAT_R16G16B16_FLOAT:
        case PIPE_FORMAT_R16G16B16A16_FLOAT:
                return V_028C70_COLOR_16_16_16_16_FLOAT;
+
        case PIPE_FORMAT_R32G32_FLOAT:
                return V_028C70_COLOR_32_32_FLOAT;
 

diff --git a/src/gallium/drivers/r600/r600_state_inlines.h b/src/gallium/drivers/r600/r600_state_inlines.h
index 1337d8ec815dec3968e40c5fc14cc818b2e49038..663529faafbc6093cbc4b20876abbf72f6db475a 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_inlines.h
+++ b/src/gallium/drivers/r600/r600_state_inlines.h
@@ -409,6 +409,8 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
 
 
                /* 64-bit buffers. */
+       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:
@@ -422,6 +424,7 @@ static INLINE uint32_t r600_translate_colorformat(enum pipe_format format)
        case PIPE_FORMAT_R32G32_FLOAT:
                return V_0280A0_COLOR_32_32_FLOAT;
 
+       case PIPE_FORMAT_R32G32_USCALED:
        case PIPE_FORMAT_R32G32_SSCALED:
                return V_0280A0_COLOR_32_32;
 
@@ -449,8 +452,12 @@ static INLINE void r600_translate_vertex_num_format(enum pipe_format format, uin
        case PIPE_FORMAT_R16G16B16_SSCALED:
        case PIPE_FORMAT_R16G16_SSCALED:
        case PIPE_FORMAT_R32G32_SSCALED:
-               num_format = V_038008_SQ_NUM_FORMAT_SCALED;
                format_comp = 1;
+       case PIPE_FORMAT_R16G16B16A16_USCALED:
+       case PIPE_FORMAT_R16G16B16_USCALED:
+       case PIPE_FORMAT_R16G16_USCALED:
+       case PIPE_FORMAT_R32G32_USCALED:
+               num_format = V_038008_SQ_NUM_FORMAT_SCALED;
                break;
        default:
                break;