diff options
author | Brian Paul <brianp@vmware.com> | 2009-01-23 17:39:44 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-01-23 17:39:44 -0700 |
commit | cba5ce166523a8bb6888a0ea28a26e30204f30a4 (patch) | |
tree | 32ff5dfd46743eefa812d654a4673cc87fea359e /src/mesa/swrast/s_triangle.c | |
parent | 628b52241b13132e2d4065b653befdf81236e651 (diff) | |
parent | 96ee3db6f76f25f8dcf36b365f6be93341d90472 (diff) |
Merge branch 'tex_combine4'
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 a2e8433e27..5d232487f3 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1070,7 +1070,8 @@ _swrast_choose_triangle( GLcontext *ctx ) && minFilter == magFilter && ctx->Light.Model.ColorControl == GL_SINGLE_COLOR && !swrast->_FogEnabled - && ctx->Texture.Unit[0].EnvMode != GL_COMBINE_EXT) { + && ctx->Texture.Unit[0].EnvMode != GL_COMBINE_EXT + && ctx->Texture.Unit[0].EnvMode != GL_COMBINE4_NV) { if (ctx->Hint.PerspectiveCorrection==GL_FASTEST) { if (minFilter == GL_NEAREST && format == MESA_FORMAT_RGB |