diff options
author | Marek Olšák <maraeo@gmail.com> | 2010-09-29 17:54:31 +0200 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2010-09-29 20:43:44 +0200 |
commit | 94e9ab975cb4187a63eeb4cd03694ebd3cb27bd8 (patch) | |
tree | 7c08ef71d7ba8ce232aea0d3e3e14107c50f1d36 /src/gallium/drivers/r300/r300_state_inlines.h | |
parent | 4e07aadabbf4b3ff57d79033e92dfab9fe299f45 (diff) | |
download | external_mesa3d-94e9ab975cb4187a63eeb4cd03694ebd3cb27bd8.zip external_mesa3d-94e9ab975cb4187a63eeb4cd03694ebd3cb27bd8.tar.gz external_mesa3d-94e9ab975cb4187a63eeb4cd03694ebd3cb27bd8.tar.bz2 |
r300g: add support for formats beginning with X, like X8R8G8B8
This is actually a format translator fix.
Diffstat (limited to 'src/gallium/drivers/r300/r300_state_inlines.h')
-rw-r--r-- | src/gallium/drivers/r300/r300_state_inlines.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/gallium/drivers/r300/r300_state_inlines.h b/src/gallium/drivers/r300/r300_state_inlines.h index 03ec127..7e50122 100644 --- a/src/gallium/drivers/r300/r300_state_inlines.h +++ b/src/gallium/drivers/r300/r300_state_inlines.h @@ -364,6 +364,7 @@ static INLINE uint16_t r300_translate_vertex_data_type(enum pipe_format format) { uint32_t result = 0; const struct util_format_description *desc; + unsigned i; desc = util_format_description(format); @@ -371,10 +372,17 @@ r300_translate_vertex_data_type(enum pipe_format format) { return R300_INVALID_FORMAT; } - switch (desc->channel[0].type) { + /* Find the first non-VOID channel. */ + for (i = 0; i < 4; i++) { + if (desc->channel[i].type != UTIL_FORMAT_TYPE_VOID) { + break; + } + } + + switch (desc->channel[i].type) { /* Half-floats, floats, doubles */ case UTIL_FORMAT_TYPE_FLOAT: - switch (desc->channel[0].size) { + switch (desc->channel[i].size) { case 16: /* Supported only on RV350 and later. */ if (desc->nr_channels > 2) { @@ -394,7 +402,7 @@ r300_translate_vertex_data_type(enum pipe_format format) { case UTIL_FORMAT_TYPE_UNSIGNED: /* Signed ints */ case UTIL_FORMAT_TYPE_SIGNED: - switch (desc->channel[0].size) { + switch (desc->channel[i].size) { case 8: result = R300_DATA_TYPE_BYTE; break; @@ -413,10 +421,10 @@ r300_translate_vertex_data_type(enum pipe_format format) { return R300_INVALID_FORMAT; } - if (desc->channel[0].type == UTIL_FORMAT_TYPE_SIGNED) { + if (desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED) { result |= R300_SIGNED; } - if (desc->channel[0].normalized) { + if (desc->channel[i].normalized) { result |= R300_NORMALIZE; } |