summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-12-15 01:13:39 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-12-15 01:13:39 +0000
commit3df033a93b45e206329e1d3d91ae20558a6ba6c0 (patch)
treeec82a05285e8002969d4c5565633b65648944140 /src/mesa
parent69a5896238c3553422fcf80feebe5fa39e636006 (diff)
fixes for fragment programs
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_pointtemp.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h
index 3735e89f10..c564f2ee8e 100644
--- a/src/mesa/swrast/s_pointtemp.h
+++ b/src/mesa/swrast/s_pointtemp.h
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.2
+ * Version: 6.3
*
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
@@ -121,7 +121,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
#if FLAGS & TEXTURE
span->arrayMask |= SPAN_TEXTURE;
for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
- if (ctx->Texture.Unit[u]._ReallyEnabled) {
+ if (ctx->Texture._EnabledCoordUnits & (1 << u)) {
const GLfloat q = vert->texcoord[u][3];
const GLfloat invQ = (q == 0.0F || q == 1.0F) ? 1.0F : (1.0F / q);
texcoord[u][0] = vert->texcoord[u][0] * invQ;
@@ -130,6 +130,10 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
texcoord[u][3] = q;
}
}
+ /* need these for fragment programs */
+ span->w = 1.0F;
+ span->dwdx = 0.0F;
+ span->dwdy = 0.0F;
#endif
#if FLAGS & SMOOTH
span->arrayMask |= SPAN_COVERAGE;
@@ -256,7 +260,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
#endif
#if FLAGS & TEXTURE
for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
- if (ctx->Texture.Unit[u]._ReallyEnabled) {
+ if (ctx->Texture._EnabledCoordUnits & (1 << u)) {
COPY_4V(span->array->texcoords[u][count], texcoord[u]);
}
}