diff options
| author | Michal Krol <michal@vmware.com> | 2009-12-09 14:22:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-12-09 14:22:30 +0100 |
| commit | dfdf83d714c0d32d9182eb3001cf642aa6cb5c87 (patch) | |
| tree | a657acb85a10fec64333c7850935de21b3fc696c /src/gallium/drivers/r300/r300_state_inlines.h | |
| parent | eb926ddf9eee1095c7fc12013f0b8375bbaeca6f (diff) | |
| download | external_mesa3d-dfdf83d714c0d32d9182eb3001cf642aa6cb5c87.zip external_mesa3d-dfdf83d714c0d32d9182eb3001cf642aa6cb5c87.tar.gz external_mesa3d-dfdf83d714c0d32d9182eb3001cf642aa6cb5c87.tar.bz2 | |
Revert "Simplify the redundant meaning of format layout."
This reverts commit eb926ddf9eee1095c7fc12013f0b8375bbaeca6f.
Diffstat (limited to 'src/gallium/drivers/r300/r300_state_inlines.h')
| -rw-r--r-- | src/gallium/drivers/r300/r300_state_inlines.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_state_inlines.h b/src/gallium/drivers/r300/r300_state_inlines.h index c71305e..7cd1f87 100644 --- a/src/gallium/drivers/r300/r300_state_inlines.h +++ b/src/gallium/drivers/r300/r300_state_inlines.h @@ -476,7 +476,8 @@ r300_translate_vertex_data_type(enum pipe_format format) { desc = util_format_description(format); - if (desc->layout != UTIL_FORMAT_LAYOUT_PLAIN) { + if (desc->layout != UTIL_FORMAT_LAYOUT_ARITH && + desc->layout != UTIL_FORMAT_LAYOUT_ARRAY) { debug_printf("r300: Bad format %s in %s:%d\n", pf_name(format), __FUNCTION__, __LINE__); assert(0); @@ -540,7 +541,8 @@ r300_translate_vertex_data_swizzle(enum pipe_format format) { assert(format); - if (desc->layout != UTIL_FORMAT_LAYOUT_PLAIN) { + if (desc->layout != UTIL_FORMAT_LAYOUT_ARITH && + desc->layout != UTIL_FORMAT_LAYOUT_ARRAY) { debug_printf("r300: Bad format %s in %s:%d\n", pf_name(format), __FUNCTION__, __LINE__); return 0; |