diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2004-08-31 11:36:14 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2004-08-31 11:36:14 +0000 |
| commit | 535408addad103421f8cc82705385de754871963 (patch) | |
| tree | 20a5ba3653d74e2e93aee83c9e011997d93ea165 | |
| parent | c372549036c8784e8e86d040f13685faa76f6d4d (diff) | |
The i915 driver was merged after EMIT_*_BGR bug was fixed. This brings
the driver into line with the correct meaning of those symbols
and fixes color corruptions.
| -rw-r--r-- | src/mesa/drivers/dri/i915/i830_vtbl.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_fragprog.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_texprog.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c index 1a659fd53e..e1ddce2bb7 100644 --- a/src/mesa/drivers/dri/i915/i830_vtbl.c +++ b/src/mesa/drivers/dri/i915/i830_vtbl.c @@ -87,13 +87,13 @@ static void i830_render_start( intelContextPtr intel ) intel->coloroffset = 3; } - EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_RGBA, VFT0_DIFFUSE ); + EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_BGRA, VFT0_DIFFUSE ); intel->specoffset = 0; if (index & (_TNL_BIT_COLOR1|_TNL_BIT_FOG)) { if (index & _TNL_BIT_COLOR1) { intel->specoffset = intel->coloroffset + 1; - EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB, VFT0_SPEC ); + EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, VFT0_SPEC ); } else EMIT_PAD( 3 ); diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c index d4fa26c61f..2c2665d00c 100644 --- a/src/mesa/drivers/dri/i915/i915_fragprog.c +++ b/src/mesa/drivers/dri/i915/i915_fragprog.c @@ -978,12 +978,12 @@ void i915ValidateFragmentProgram( i915ContextPtr i915 ) if (inputsRead & FRAG_BIT_COL0) { intel->coloroffset = offset / 4; - EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_RGBA, S4_VFMT_COLOR, 4 ); + EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_BGRA, S4_VFMT_COLOR, 4 ); } if (inputsRead & FRAG_BIT_COL1) { intel->specoffset = offset / 4; - EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB, S4_VFMT_SPEC_FOG, 3 ); + EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, S4_VFMT_SPEC_FOG, 3 ); EMIT_PAD( 1 ); } diff --git a/src/mesa/drivers/dri/i915/i915_texprog.c b/src/mesa/drivers/dri/i915/i915_texprog.c index 32c7e4b9ee..ecf3a38a20 100644 --- a/src/mesa/drivers/dri/i915/i915_texprog.c +++ b/src/mesa/drivers/dri/i915/i915_texprog.c @@ -593,12 +593,12 @@ void i915ValidateTextureProgram( i915ContextPtr i915 ) } intel->coloroffset = offset / 4; - EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_RGBA, S4_VFMT_COLOR, 4 ); + EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_BGRA, S4_VFMT_COLOR, 4 ); if (index & (_TNL_BIT_COLOR1|_TNL_BIT_FOG)) { if (index & _TNL_BIT_COLOR1) { intel->specoffset = offset / 4; - EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB, S4_VFMT_SPEC_FOG, 3 ); + EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, S4_VFMT_SPEC_FOG, 3 ); } else EMIT_PAD( 3 ); |