summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_fragprog.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-03-08 17:58:54 -0600
committerBrian Paul <brianp@vmware.com>2009-04-01 20:20:03 -0600
commitbd9b2be8284fda3f8aac235908ded118b5648a38 (patch)
tree0187557ccb00a3ff7785b2cb8beeb7aaf217419f /src/mesa/swrast/s_fragprog.c
parenta35ad020f9449849f7616788aa6bd9e439d6c518 (diff)
mesa: texture combine clean-ups
Use MAX_COMBINER_TERMS instead of 4. Rename some vars. Update comments.
Diffstat (limited to 'src/mesa/swrast/s_fragprog.c')
-rw-r--r--src/mesa/swrast/s_fragprog.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 5f032bbd69..b71fb9eae9 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -74,7 +74,6 @@ fetch_texel_lod( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
- /* XXX use a float-valued TextureSample routine here!!! */
swrast->TextureSample[unit](ctx, texObj, 1,
(const GLfloat (*)[4]) texcoord,
&lambda, &rgba);
@@ -116,7 +115,6 @@ fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4],
lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
- /* XXX use a float-valued TextureSample routine here!!! */
swrast->TextureSample[unit](ctx, texObj, 1,
(const GLfloat (*)[4]) texcoord,
&lambda, &rgba);