summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/swrast/s_context.c4
-rw-r--r--src/mesa/swrast/s_zoom.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 00702b43013..e113adb6892 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -786,8 +786,8 @@ _swrast_CreateContext( GLcontext *ctx )
swrast->SpanArrays->rgba = swrast->SpanArrays->color.sz2.rgba;
swrast->SpanArrays->spec = swrast->SpanArrays->color.sz2.spec;
#else
- swrast->SpanArrays->rgba = swrast->SpanArrays->color.sz4.rgba;
- swrast->SpanArrays->spec = swrast->SpanArrays->color.sz4.spec;
+ swrast->SpanArrays->rgba = swrast->SpanArrays->attribs[FRAG_ATTRIB_COL0];
+ swrast->SpanArrays->spec = swrast->SpanArrays->attribs[FRAG_ATTRIB_COL1];
#endif
/* init point span buffer */
diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c
index 9bec0bb1a1c..1fac7498aa8 100644
--- a/src/mesa/swrast/s_zoom.c
+++ b/src/mesa/swrast/s_zoom.c
@@ -153,8 +153,8 @@ zoom_span( GLcontext *ctx, GLint imgX, GLint imgY, const SWspan *span,
zoomed_arrays.rgba = zoomed_arrays.color.sz2.rgba;
zoomed_arrays.spec = zoomed_arrays.color.sz2.spec;
#else
- zoomed_arrays.rgba = zoomed_arrays.color.sz4.rgba;
- zoomed_arrays.spec = zoomed_arrays.color.sz4.spec;
+ zoomed_arrays.rgba = zoomed_arrays.attribs[FRAG_ATTRIB_COL0];
+ zoomed_arrays.spec = zoomed_arrays.attribs[FRAG_ATTRIB_COL1];
#endif