diff options
| author | Brian Paul <[email protected]> | 2003-12-09 01:53:03 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-12-09 01:53:03 +0000 |
| commit | 853bda3e7c4dfa7d8cc462729f6a3dce89e44963 (patch) | |
| tree | 9fdbf1812276c8f1f2bb8e56d82d0d163e22eae0 /src/mesa/swrast/s_triangle.c | |
| parent | e8bec8832b50b8c2310e40951bea8bd78f89715c (diff) | |
Update NEED_SECONDARY_COLOR macro to test if either vertex/fragment
programs are enabled and if they need secondary color input register.
Patch by Karl Rasche, with tweaks by Brian.
Diffstat (limited to 'src/mesa/swrast/s_triangle.c')
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 5af74ee3ab8..3e429664670 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1055,7 +1055,7 @@ _swrast_choose_triangle( GLcontext *ctx ) } } - if (ctx->Texture._EnabledCoordUnits) { + if (ctx->Texture._EnabledCoordUnits || ctx->FragmentProgram.Enabled) { /* Ugh, we do a _lot_ of tests to pick the best textured tri func */ const struct gl_texture_object *texObj2D; const struct gl_texture_image *texImg; |