diff options
| author | Brian Paul <[email protected]> | 2002-09-23 16:37:13 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2002-09-23 16:37:13 +0000 |
| commit | 681b8c9d1ba06c8c82e687a5ced369b72e6b1eb9 (patch) | |
| tree | bfe222c6384be8ef34eadddb44262c9bd9ddc1c2 /src/mesa/swrast/s_triangle.c | |
| parent | b7808884bb26b6abdd44a03ff47885fb646686a5 (diff) | |
merge gl_texture_image RowStride from DRI 4.0.4
Diffstat (limited to 'src/mesa/swrast/s_triangle.c')
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 4e2c40625b4..a26f7319c5d 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.61 2002/08/07 00:45:07 brianp Exp $ */ +/* $Id: s_triangle.c,v 1.62 2002/09/23 16:37:15 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1136,6 +1136,7 @@ _swrast_choose_triangle( GLcontext *ctx ) && texObj2D->WrapS==GL_REPEAT && texObj2D->WrapT==GL_REPEAT && texImg->Border==0 + && texImg->Width == texImg->RowStride && (format == MESA_FORMAT_RGB || format == MESA_FORMAT_RGBA) && minFilter == magFilter && ctx->Light.Model.ColorControl == GL_SINGLE_COLOR |