summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_triangle.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-01-28 10:31:05 -0700
committerBrian Paul <brianp@vmware.com>2009-01-28 10:31:05 -0700
commit54c62ba5c36f3e2b279151f5df851d2ceee15319 (patch)
tree8ecbcfc4b129957f263e22aaacf48c2936b65757 /src/mesa/swrast/s_triangle.c
parent4a89e51c5f88b57040b361b62e80a57c8248ba4b (diff)
mesa: implement texture swizzling in swrast
And enable GL_EXT_texture_swizzle for software drivers.
Diffstat (limited to 'src/mesa/swrast/s_triangle.c')
-rw-r--r--src/mesa/swrast/s_triangle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index 5d232487f3..063130714c 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -35,6 +35,7 @@
#include "main/imports.h"
#include "main/macros.h"
#include "main/texformat.h"
+#include "shader/prog_instruction.h"
#include "s_aatriangle.h"
#include "s_context.h"
@@ -1063,6 +1064,7 @@ _swrast_choose_triangle( GLcontext *ctx )
&& ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT
&& texObj2D->WrapS == GL_REPEAT
&& texObj2D->WrapT == GL_REPEAT
+ && texObj2D->_Swizzle == SWIZZLE_NOOP
&& texImg->_IsPowerOfTwo
&& texImg->Border == 0
&& texImg->Width == texImg->RowStride