diff options
| author | Brian Paul <brianp@vmware.com> | 2009-01-23 17:30:54 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-01-23 17:30:54 -0700 |
| commit | 2d508c1d5c53dc475e5262593dd4dac5575a6b08 (patch) | |
| tree | 2fc0b5b1cb7f73e616c57042f853dbd08145557b /src/mesa/swrast/s_triangle.c | |
| parent | e082314cab42f43b0438603a282f01920004e6f0 (diff) | |
swrast: updates for GL_NV_texture_env_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 |