diff options
| -rw-r--r-- | src/mesa/swrast/s_drawpix.c | 6 | ||||
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index b7ac3f7ade7..479c9cf99f6 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -1,4 +1,4 @@ -/* $Id: s_drawpix.c,v 1.41 2002/12/05 04:48:53 brianp Exp $ */ +/* $Id: s_drawpix.c,v 1.42 2002/12/18 15:02:19 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -191,8 +191,8 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y, /* setup array of fragment Z value to pass to zoom function */ GLdepth z = (GLdepth) (ctx->Current.RasterPos[2] * ctx->DepthMaxF); GLint i; - if (drawWidth < MAX_WIDTH) - return GL_FALSE; /* take the general path solution */ + if (drawWidth > MAX_WIDTH) + return GL_FALSE; /* fall back to general case path */ for (i=0; i<drawWidth; i++) zSpan[i] = z; diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index d1575cb691d..324a51582c1 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1,4 +1,4 @@ -/* $Id: s_triangle.c,v 1.65 2002/11/13 16:51:01 brianp Exp $ */ +/* $Id: s_triangle.c,v 1.66 2002/12/18 15:02:19 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1065,7 +1065,7 @@ _swrast_choose_triangle( GLcontext *ctx ) magFilter = texObj2D ? texObj2D->MagFilter : (GLenum) 0; envMode = ctx->Texture.Unit[0].EnvMode; - /* First see if we can used an optimized 2-D texture function */ + /* First see if we can use an optimized 2-D texture function */ if (ctx->Texture._EnabledUnits == 1 && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT && texObj2D->WrapS==GL_REPEAT |