From: Brian Paul Date: Sat, 15 Jul 2000 03:14:25 +0000 (+0000) Subject: another tweak to optimized GL_RETURN code X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d126c7f8d8ae16748a61ab4d05e3a59ee55c759f;p=mesa.git another tweak to optimized GL_RETURN code --- diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c index cb226022d91..79733d6aca3 100644 --- a/src/mesa/main/accum.c +++ b/src/mesa/main/accum.c @@ -1,4 +1,4 @@ -/* $Id: accum.c,v 1.22 2000/07/14 04:15:37 brianp Exp $ */ +/* $Id: accum.c,v 1.23 2000/07/15 03:14:25 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -348,16 +348,14 @@ _mesa_Accum( GLenum op, GLfloat value ) if (ctx->IntegerAccumMode && value != 1.0) rescale_accum(ctx); - if (ctx->IntegerAccumMode && ctx->IntegerAccumScaler > 0 - && (GLint) (256 / ctx->IntegerAccumScaler) <= 32768) { + if (ctx->IntegerAccumMode && ctx->IntegerAccumScaler > 0) { /* build lookup table to avoid many floating point multiplies */ const GLfloat mult = ctx->IntegerAccumScaler; static GLchan multTable[32768]; static GLfloat prevMult = 0.0; GLuint j; - const GLint max = (GLint) (256 / mult); + const GLint max = MIN2((GLint) (256 / mult), 32767); if (mult != prevMult) { - assert(max <= 32768); for (j = 0; j < max; j++) multTable[j] = (GLint) ((GLfloat) j * mult + 0.5F); prevMult = mult;