diff options
| author | Gareth Hughes <[email protected]> | 2001-03-28 20:40:51 +0000 |
|---|---|---|
| committer | Gareth Hughes <[email protected]> | 2001-03-28 20:40:51 +0000 |
| commit | 38f28665bf9fb5b2464738ca5074848ec2777ae1 (patch) | |
| tree | d7df29f52814f6cd466b3ad9c3252c744ee5071c /src/mesa/swrast/s_triangle.c | |
| parent | 53933fe9dbfae168dce0688b406810462a6d577b (diff) | |
More texture format updates. Drivers now need only plug an appropriate
format into texImage->TexFormat, the rest is handled by core Mesa.
Diffstat (limited to 'src/mesa/swrast/s_triangle.c')
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index e46a7963b54..32022bb678d 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.21 2001/03/22 04:54:08 brianp Exp $ */ +/* $Id: s_triangle.c,v 1.22 2001/03/28 20:40:52 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -28,7 +28,7 @@ /* * When the device driver doesn't implement triangle rasterization it * can hook in _swrast_Triangle, which eventually calls one of these - * functions to draw triangles. + * functions to draw triangles. */ #include "glheader.h" @@ -2284,7 +2284,7 @@ _swrast_choose_triangle( GLcontext *ctx ) SWcontext *swrast = SWRAST_CONTEXT(ctx); const GLboolean rgbmode = ctx->Visual.rgbMode; - if (ctx->Polygon.CullFlag && + if (ctx->Polygon.CullFlag && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK) { USE(nodraw_triangle); return; @@ -2333,7 +2333,7 @@ _swrast_choose_triangle( GLcontext *ctx ) && texObj2D->WrapT==GL_REPEAT && texImg->Border==0 && (format == GL_RGB || format == GL_RGBA) - && texImg->Type == CHAN_TYPE + && texImg->TexFormat->Type == CHAN_TYPE && minFilter == magFilter && ctx->Light.Model.ColorControl == GL_SINGLE_COLOR && ctx->Texture.Unit[0].EnvMode != GL_COMBINE_EXT) { |