summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_span.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-09-06 02:56:08 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-09-06 02:56:08 +0000
commit5f60a0b50ada1865d4fc6a724366e8ea0cc9a72f (patch)
tree5ff6600c6ca0fba4999197e38ff0b9759638cdd3 /src/mesa/swrast/s_span.c
parenta2ae6faf1a853655ac6c58b80a7dc3b1811a8740 (diff)
GL_EXT_stencil_two_side extension, not 100% complete yet.
Diffstat (limited to 'src/mesa/swrast/s_span.c')
-rw-r--r--src/mesa/swrast/s_span.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 67636569af..74fccc55c7 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1,4 +1,4 @@
-/* $Id: s_span.c,v 1.46 2002/08/07 00:45:07 brianp Exp $ */
+/* $Id: s_span.c,v 1.47 2002/09/06 02:56:09 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -128,14 +128,9 @@ _mesa_span_default_texcoords( GLcontext *ctx, struct sw_span *span )
{
GLuint i;
for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
- span->tex[i][0] = ctx->Current.RasterTexCoords[i][0];
- span->tex[i][1] = ctx->Current.RasterTexCoords[i][1];
- span->tex[i][2] = ctx->Current.RasterTexCoords[i][2];
- span->tex[i][3] = ctx->Current.RasterTexCoords[i][3];
- span->texStepX[i][0] = 0.0;
- span->texStepX[i][1] = 0.0;
- span->texStepX[i][2] = 0.0;
- span->texStepX[i][3] = 0.0;
+ COPY_4V(span->tex[i], ctx->Current.RasterTexCoords[i]);
+ ASSIGN_4V(span->texStepX[i], 0.0F, 0.0F, 0.0F, 0.0F);
+ ASSIGN_4V(span->texStepY[i], 0.0F, 0.0F, 0.0F, 0.0F);
}
span->interpMask |= SPAN_TEXTURE;
}
@@ -808,7 +803,8 @@ _mesa_write_index_span( GLcontext *ctx, struct sw_span *span)
_mesa_span_interpolate_z(ctx, span);
if (ctx->Stencil.Enabled) {
- if (!_mesa_stencil_and_ztest_span(ctx, span)) {
+ const GLuint face = 0; /* XXX stencil two side */
+ if (!_mesa_stencil_and_ztest_span(ctx, span, face)) {
span->arrayMask = origArrayMask;
return;
}
@@ -987,7 +983,8 @@ _mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span)
_mesa_span_interpolate_z(ctx, span);
if (ctx->Stencil.Enabled) {
- if (!_mesa_stencil_and_ztest_span(ctx, span)) {
+ const GLuint face = 0; /* XXX stencil two side */
+ if (!_mesa_stencil_and_ztest_span(ctx, span, face)) {
span->interpMask = origInterpMask;
span->arrayMask = origArrayMask;
return;
@@ -1217,7 +1214,8 @@ _mesa_write_texture_span( GLcontext *ctx, struct sw_span *span)
_mesa_span_interpolate_z(ctx, span);
if (ctx->Stencil.Enabled) {
- if (!_mesa_stencil_and_ztest_span(ctx, span)) {
+ const GLuint face = 0; /* XXX stencil two side */
+ if (!_mesa_stencil_and_ztest_span(ctx, span, face)) {
span->arrayMask = origArrayMask;
return;
}