summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-07-14 04:15:37 +0000
committerBrian Paul <[email protected]>2000-07-14 04:15:37 +0000
commitf8246e2fdad5180ce300ad1ff187c248d75c12ad (patch)
tree217e7d3f08834e0b70a7b6b48aa9e23efccb3471
parent7eb0603574ebf36059a0813397398400221cc1e3 (diff)
added extra check to optimized GL_RETURN case
-rw-r--r--src/mesa/main/accum.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 37967f21338..cb226022d91 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -1,4 +1,4 @@
-/* $Id: accum.c,v 1.21 2000/06/19 00:42:24 brianp Exp $ */
+/* $Id: accum.c,v 1.22 2000/07/14 04:15:37 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -348,7 +348,8 @@ _mesa_Accum( GLenum op, GLfloat value )
if (ctx->IntegerAccumMode && value != 1.0)
rescale_accum(ctx);
- if (ctx->IntegerAccumMode && ctx->IntegerAccumScaler > 0) {
+ if (ctx->IntegerAccumMode && ctx->IntegerAccumScaler > 0
+ && (GLint) (256 / ctx->IntegerAccumScaler) <= 32768) {
/* build lookup table to avoid many floating point multiplies */
const GLfloat mult = ctx->IntegerAccumScaler;
static GLchan multTable[32768];