summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_state_inlines.h
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2010-04-26 01:58:07 +0200
committerMarek Olšák <maraeo@gmail.com>2010-04-26 07:22:00 +0200
commit52e591383bdce49cb46a1162aff9632c57e06504 (patch)
treebad7c387c5bde6795fbfe4a26959d2afe7e60662 /src/gallium/drivers/r300/r300_state_inlines.h
parent824e2afea020fb1afded08141e1b7d1b3ecefd34 (diff)
downloadexternal_mesa3d-52e591383bdce49cb46a1162aff9632c57e06504.zip
external_mesa3d-52e591383bdce49cb46a1162aff9632c57e06504.tar.gz
external_mesa3d-52e591383bdce49cb46a1162aff9632c57e06504.tar.bz2
r300g: allow unaligned vertex formats if the stride is dword-aligned
Diffstat (limited to 'src/gallium/drivers/r300/r300_state_inlines.h')
-rw-r--r--src/gallium/drivers/r300/r300_state_inlines.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gallium/drivers/r300/r300_state_inlines.h b/src/gallium/drivers/r300/r300_state_inlines.h
index ca6fc65..c2bff67 100644
--- a/src/gallium/drivers/r300/r300_state_inlines.h
+++ b/src/gallium/drivers/r300/r300_state_inlines.h
@@ -443,6 +443,7 @@ r300_translate_vertex_data_type(enum pipe_format format) {
static INLINE uint16_t
r300_translate_vertex_data_swizzle(enum pipe_format format) {
const struct util_format_description *desc = util_format_description(format);
+ unsigned i, swizzle = 0;
assert(format);
@@ -452,11 +453,12 @@ r300_translate_vertex_data_swizzle(enum pipe_format format) {
return 0;
}
- return ((desc->swizzle[0] << R300_SWIZZLE_SELECT_X_SHIFT) |
- (desc->swizzle[1] << R300_SWIZZLE_SELECT_Y_SHIFT) |
- (desc->swizzle[2] << R300_SWIZZLE_SELECT_Z_SHIFT) |
- (desc->swizzle[3] << R300_SWIZZLE_SELECT_W_SHIFT) |
- (0xf << R300_WRITE_ENA_SHIFT));
+ for (i = 0; i < 4; i++) {
+ swizzle |=
+ MIN2(desc->swizzle[i], R300_SWIZZLE_SELECT_FP_ONE) << (3*i);
+ }
+
+ return swizzle | (0xf << R300_WRITE_ENA_SHIFT);
}
#endif /* R300_STATE_INLINES_H */