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

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 781277dfda32dc383446f11b50f2642b43781c4e..9aa61a466a044d95c01d18bf89fa8fd3f314bf33 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -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

diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c
index a59b7ac5adc2c8210aa673796cc3605f6ff37c4e..f42bcd9e45a7f060647787221c99e0721c6bca9a 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_emit.c
@@ -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;
        }