summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-02-02 07:50:31 -0700
committerBrian Paul <brianp@vmware.com>2009-02-02 07:50:31 -0700
commit11a363e632b2850f8a2fe835263280b1062cbd0e (patch)
tree849979474a64fa8cda1366154c511710bc9a6846
parent41e63fbdb250d29361e37c2daf3fffaf6c56790f (diff)
mesa: move code after decls. Fixes Window build failure.
(cherry picked from master, commit 92ced46eaf1f389108ed8d3d788498d799f0b385)
-rw-r--r--src/mesa/swrast/s_triangle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index a2e8433e271..a501f428e5b 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -265,9 +265,6 @@ affine_span(GLcontext *ctx, SWspan *span,
GLchan sample[4]; /* the filtered texture sample */
const GLuint texEnableSave = ctx->Texture._EnabledUnits;
- /* Disable tex units so they're not re-applied in swrast_write_rgba_span */
- ctx->Texture._EnabledUnits = 0x0;
-
/* Instead of defining a function for each mode, a test is done
* between the outer and inner loops. This is to reduce code size
* and complexity. Observe that an optimizing compiler kills
@@ -396,6 +393,9 @@ affine_span(GLcontext *ctx, SWspan *span,
GLuint i;
GLchan *dest = span->array->rgba[0];
+ /* Disable tex units so they're not re-applied in swrast_write_rgba_span */
+ ctx->Texture._EnabledUnits = 0x0;
+
span->intTex[0] -= FIXED_HALF;
span->intTex[1] -= FIXED_HALF;
switch (info->filter) {