projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swrast: Fix fixed-function fragment processing
[mesa.git]
/
src
/
mesa
/
swrast
/
s_aatriangle.c
diff --git
a/src/mesa/swrast/s_aatriangle.c
b/src/mesa/swrast/s_aatriangle.c
index c68fdf63b681dcdb5b2d9bdf01afb71c791b3090..b59177fa76228634c8d0113a8563f51fb5a7c682 100644
(file)
--- a/
src/mesa/swrast/s_aatriangle.c
+++ b/
src/mesa/swrast/s_aatriangle.c
@@
-299,7
+299,7
@@
_swrast_set_aa_triangle_function(struct gl_context *ctx)
ASSERT(ctx->Polygon.SmoothFlag);
if (ctx->Texture._EnabledCoordUnits != 0
ASSERT(ctx->Polygon.SmoothFlag);
if (ctx->Texture._EnabledCoordUnits != 0
- ||
ctx->FragmentProgram._Current
+ ||
_swrast_use_fragment_program(ctx)
|| swrast->_FogEnabled
|| _mesa_need_secondary_color(ctx)) {
SWRAST_CONTEXT(ctx)->Triangle = general_aa_tri;
|| swrast->_FogEnabled
|| _mesa_need_secondary_color(ctx)) {
SWRAST_CONTEXT(ctx)->Triangle = general_aa_tri;