diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-03-11 12:14:05 +0100 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2010-03-11 12:14:05 +0100 |
| commit | fc1dd5ce1de8b9c0a02b9fb08aaeac0c38372e65 (patch) | |
| tree | 65719e70a7ff5d37a9626c63fbe8f505370e4b27 /src/mesa/swrast/s_span.c | |
| parent | aa311ae61680f0fc300e33e8955c6c58cafd5fb4 (diff) | |
| parent | 54af54277a7a469ed2b9821ef6ed7ed464381f91 (diff) | |
Merge remote branch 'origin/7.8'
Diffstat (limited to 'src/mesa/swrast/s_span.c')
| -rw-r--r-- | src/mesa/swrast/s_span.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 29f070686f..687c8eb0bf 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -60,6 +60,7 @@ void _swrast_span_default_attribs(GLcontext *ctx, SWspan *span) { + GLchan r, g, b, a; /* Z*/ { const GLfloat depthMax = ctx->DrawBuffer->_DepthMaxF; @@ -80,7 +81,6 @@ _swrast_span_default_attribs(GLcontext *ctx, SWspan *span) span->attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0; /* primary color, or color index */ - GLchan r, g, b, a; UNCLAMPED_FLOAT_TO_CHAN(r, ctx->Current.RasterColor[0]); UNCLAMPED_FLOAT_TO_CHAN(g, ctx->Current.RasterColor[1]); UNCLAMPED_FLOAT_TO_CHAN(b, ctx->Current.RasterColor[2]); |