AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r300: Removed duplicate AOS format defines; already defined in r300_reg.h.

Browse Source
This commit is contained in:
Oliver McFadden
2007-05-26 20:59:16 +00:00
parent e96d10a861
commit 3b8fc727e6
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/r300/r300_context.h
-5
View File
@@ -782,11 +782,6 @@ struct r300_fragment_program {
#define R300_MAX_AOS_ARRAYS 16
#define AOS_FORMAT_USHORT 0
#define AOS_FORMAT_FLOAT 1
#define AOS_FORMAT_UNSIGNED_BYTE 2
#define AOS_FORMAT_FLOAT_COLOR 3
#define REG_COORDS 0
#define REG_COLOR0 1
#define REG_TEX0 2
src/mesa/drivers/dri/r300/r300_emit.c
+3 -3
View File
@@ -214,8 +214,8 @@ static GLuint r300VAPInputRoute0(uint32_t * dst, GLvector4f ** attribptr,
/* dw: size, inputs, stop bit, type */
for (i = 0; i + 1 < nr; i += 2) {
dw = (attribptr[tab[i]]->size - 1) | (inputs[tab[i]] << 8) | (AOS_FORMAT_FLOAT << 14);
dw |= ((attribptr[tab[i + 1]]->size - 1) | (inputs[tab[i + 1]] << 8) | (AOS_FORMAT_FLOAT << 14)) << 16;
dw = (attribptr[tab[i]]->size - 1) | (inputs[tab[i]] << 8) | R300_INPUT_ROUTE_FLOAT;
dw |= ((attribptr[tab[i + 1]]->size - 1) | (inputs[tab[i + 1]] << 8) | R300_INPUT_ROUTE_FLOAT) << 16;
if (i + 2 == nr) {
dw |= (1 << (13 + 16));
}
@@ -223,7 +223,7 @@ static GLuint r300VAPInputRoute0(uint32_t * dst, GLvector4f ** attribptr,
}
if (nr & 1) {
dw = (attribptr[tab[nr - 1]]->size - 1) | (inputs[tab[nr - 1]] << 8) | (AOS_FORMAT_FLOAT << 14);
dw = (attribptr[tab[nr - 1]]->size - 1) | (inputs[tab[nr - 1]] << 8) | R300_INPUT_ROUTE_FLOAT;
dw |= 1 << 13;
dst[nr >> 1] = dw;
}