diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-12 14:57:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-12 14:57:48 +0000 |
| commit | 77ec02adbc8f9657e7749b307d3cc86ccbd163ea (patch) | |
| tree | 8b11e4e5002a05a69a7b7dfe5ce79162448f2aa2 /mesalib/src/mesa/swrast | |
| parent | f81bb3160c5f39d8f7ad329e99865af88f02b96a (diff) | |
| download | vcxsrv-77ec02adbc8f9657e7749b307d3cc86ccbd163ea.tar.gz vcxsrv-77ec02adbc8f9657e7749b307d3cc86ccbd163ea.tar.bz2 vcxsrv-77ec02adbc8f9657e7749b307d3cc86ccbd163ea.zip | |
libX11 pixman mesa git update 12 Mar 2011
Diffstat (limited to 'mesalib/src/mesa/swrast')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_aatriangle.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/swrast/s_triangle.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mesalib/src/mesa/swrast/s_aatriangle.c b/mesalib/src/mesa/swrast/s_aatriangle.c index ba92fc14a..07667226a 100644 --- a/mesalib/src/mesa/swrast/s_aatriangle.c +++ b/mesalib/src/mesa/swrast/s_aatriangle.c @@ -33,6 +33,7 @@ #include "main/colormac.h"
#include "main/macros.h"
#include "main/imports.h"
+#include "main/state.h"
#include "s_aatriangle.h"
#include "s_context.h"
#include "s_span.h"
@@ -305,7 +306,7 @@ _swrast_set_aa_triangle_function(struct gl_context *ctx) if (ctx->Texture._EnabledCoordUnits != 0
|| ctx->FragmentProgram._Current
|| swrast->_FogEnabled
- || NEED_SECONDARY_COLOR(ctx)) {
+ || _mesa_need_secondary_color(ctx)) {
SWRAST_CONTEXT(ctx)->Triangle = general_aa_tri;
}
else {
diff --git a/mesalib/src/mesa/swrast/s_triangle.c b/mesalib/src/mesa/swrast/s_triangle.c index 10a1dc1c1..c2c1ce221 100644 --- a/mesalib/src/mesa/swrast/s_triangle.c +++ b/mesalib/src/mesa/swrast/s_triangle.c @@ -35,6 +35,7 @@ #include "main/imports.h"
#include "main/macros.h"
#include "main/mtypes.h"
+#include "main/state.h"
#include "program/prog_instruction.h"
#include "s_aatriangle.h"
@@ -1032,7 +1033,7 @@ _swrast_choose_triangle( struct gl_context *ctx ) if (ctx->Texture._EnabledCoordUnits ||
ctx->FragmentProgram._Current ||
ctx->ATIFragmentShader._Enabled ||
- NEED_SECONDARY_COLOR(ctx) ||
+ _mesa_need_secondary_color(ctx) ||
swrast->_FogEnabled) {
/* Ugh, we do a _lot_ of tests to pick the best textured tri func */
const struct gl_texture_object *texObj2D;
@@ -1113,7 +1114,7 @@ _swrast_choose_triangle( struct gl_context *ctx ) }
else {
ASSERT(!swrast->_FogEnabled);
- ASSERT(!NEED_SECONDARY_COLOR(ctx));
+ ASSERT(!_mesa_need_secondary_color(ctx));
if (ctx->Light.ShadeModel==GL_SMOOTH) {
/* smooth shaded, no texturing, stippled or some raster ops */
#if CHAN_BITS != 8
|