Mesa (gallium-mesa-7.4): mesa: move code after decls. Fixes Window build failure.
Alan Hourihane
alanh at kemper.freedesktop.org
Tue Feb 3 10:17:01 UTC 2009
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 11a363e632b2850f8a2fe835263280b1062cbd0e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=11a363e632b2850f8a2fe835263280b1062cbd0e
Author: Brian Paul <brianp at vmware.com>
Date: Mon Feb 2 07:50:31 2009 -0700
mesa: move code after decls. Fixes Window build failure.
(cherry picked from master, commit 92ced46eaf1f389108ed8d3d788498d799f0b385)
---
src/mesa/swrast/s_triangle.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index a2e8433..a501f42 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) {
More information about the mesa-commit
mailing list