summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorMarkus Amsler <markus.amsler@oribi.org>2008-03-17 12:02:56 +0100
committerJerome Glisse <glisse@freedesktop.org>2008-03-17 12:02:56 +0100
commitf0c8863dbb71b2c3605bb8eb9526c7d8d13793cf (patch)
tree0bb673c6feaf9c36b37c4832962cfef51f18aec3 /src/mesa/drivers
parent8d5231a3582e4f2769ac0685cf0174e09750700e (diff)
r300: Simplify r300VAPInputRoute0, check for valid input.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/r300/r300_emit.c24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c
index a135376398..8e1d801a8d 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_emit.c
@@ -210,22 +210,18 @@ static void r300EmitVec(GLcontext * ctx, struct r300_dma_region *rvb,
static GLuint r300VAPInputRoute0(uint32_t * dst, GLvector4f ** attribptr,
int *inputs, GLint * tab, GLuint nr)
{
- GLuint i, dw;
-
+ GLushort i, w;
+ uint16_t * dst16 = (uint16_t *) dst;
+
/* type, inputs, stop bit, size */
- for (i = 0; i + 1 < nr; i += 2) {
- dw = R300_INPUT_ROUTE_FLOAT | (inputs[tab[i]] << 8) | (attribptr[tab[i]]->size - 1);
- dw |= (R300_INPUT_ROUTE_FLOAT | (inputs[tab[i + 1]] << 8) | (attribptr[tab[i + 1]]->size - 1)) << 16;
- if (i + 2 == nr) {
- dw |= (R300_VAP_INPUT_ROUTE_END << 16);
+ for (i = 0; i < nr; i++) {
+ /* make sure input is valid, would lockup the gpu */
+ assert(inputs[tab[i]] != -1);
+ w = R300_INPUT_ROUTE_FLOAT | (inputs[tab[i]] << 8) | (attribptr[tab[i]]->size - 1);
+ if (i + 1 == nr) {
+ w |= R300_VAP_INPUT_ROUTE_END;
}
- dst[i >> 1] = dw;
- }
-
- if (nr & 1) {
- dw = R300_INPUT_ROUTE_FLOAT | (inputs[tab[nr - 1]] << 8) | (attribptr[tab[nr - 1]]->size - 1);
- dw |= R300_VAP_INPUT_ROUTE_END;
- dst[nr >> 1] = dw;
+ dst16[i] = w;
}
return (nr + 1) >> 1;