Module: Mesa
Branch: master
Commit: 95e04c3d74aef91bde8653bddc4b0013b68fedd1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=95e04c3d74aef91bde8653bddc4b0013b68fedd1
Author: Dave Airlie <airl...@redhat.com>
Date: Fri Sep 24 10:47:14 2010 +1000
r600g: some more vertex formats
---
src/gallium/drivers/r600/eg_state_inlines.h | 6 +++---
src/gallium/drivers/r600/r600_state_inlines.h | 9 ++++++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/r600/eg_state_inlines.h
b/src/gallium/drivers/r600/eg_state_inlines.h
index d9897e0..4723aee 100644
--- 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 1337d8e..663529f 100644
--- 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;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
