diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2004-04-22 08:14:48 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2004-04-22 08:14:48 +0000 |
| commit | 7bd5343990ccccdc5d2d06b8b11dd20fa8e04255 (patch) | |
| tree | 72e499e51437bf5f102e51d87ab6ab5ca0efb91c | |
| parent | 66fdc3c948096a53dd304f1906135a041075c0b7 (diff) | |
Fix order of EMIT_4UB_4F declarations
| -rw-r--r-- | src/mesa/drivers/dri/i830/i830_tris.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/savage/savagetris.c | 4 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vertex.h | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i830/i830_tris.c b/src/mesa/drivers/dri/i830/i830_tris.c index 9c68524601..addbfff965 100644 --- a/src/mesa/drivers/dri/i830/i830_tris.c +++ b/src/mesa/drivers/dri/i830/i830_tris.c @@ -747,11 +747,11 @@ static void i830RenderStart( GLcontext *ctx ) EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_3F_VIEWPORT, VRTX_HAS_XYZ ); } - EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_RGBA, VRTX_HAS_DIFFUSE ); + EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_BGRA, VRTX_HAS_DIFFUSE ); if (index & (_TNL_BIT_COLOR1|_TNL_BIT_FOG)) { if (index & _TNL_BIT_COLOR1) - EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB, VRTX_HAS_SPEC ); + EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, VRTX_HAS_SPEC ); else EMIT_PAD( 3 ); diff --git a/src/mesa/drivers/dri/savage/savagetris.c b/src/mesa/drivers/dri/savage/savagetris.c index 6ed2b0f9b6..1cb2d46e90 100644 --- a/src/mesa/drivers/dri/savage/savagetris.c +++ b/src/mesa/drivers/dri/savage/savagetris.c @@ -742,10 +742,10 @@ static void savageRenderStart( GLcontext *ctx ) } /* t_context.c always includes a diffuse color */ - EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_RGBA, SAVAGE_HW_NO_CD ); + EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_BGRA, SAVAGE_HW_NO_CD ); if (index & (_TNL_BIT_COLOR1|_TNL_BIT_FOG)) { - EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB, SAVAGE_HW_NO_CS ); + EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, SAVAGE_HW_NO_CS ); EMIT_ATTR( _TNL_ATTRIB_FOG, EMIT_1UB_1F, SAVAGE_HW_NO_CS ); } diff --git a/src/mesa/tnl/t_vertex.h b/src/mesa/tnl/t_vertex.h index 04106264ff..8c93907c6f 100644 --- a/src/mesa/tnl/t_vertex.h +++ b/src/mesa/tnl/t_vertex.h @@ -28,6 +28,8 @@ #ifndef _TNL_VERTEX_H #define _TNL_VERTEX_H +#include "mtypes.h" + /* New mechanism to specify hardware vertices so that tnl can build * and manipulate them directly. */ @@ -46,10 +48,10 @@ enum tnl_attr_format { EMIT_4F_VIEWPORT, /* do viewport transform and emit */ EMIT_3F_XYW, /* for projective texture */ EMIT_1UB_1F, /* for fog coordinate */ - EMIT_3UB_3F_BGR, /* for specular color */ EMIT_3UB_3F_RGB, /* for specular color */ - EMIT_4UB_4F_BGRA, /* for color */ + EMIT_3UB_3F_BGR, /* for specular color */ EMIT_4UB_4F_RGBA, /* for color */ + EMIT_4UB_4F_BGRA, /* for color */ EMIT_4CHAN_4F_RGBA, /* for swrast color */ EMIT_PAD, /* leave a hole of 'offset' bytes */ EMIT_MAX |