From: Felix Kuehling <fxkuehl@gmx.de>
Date: Fri, 7 Jan 2005 10:55:13 +0000 (+0000)
Subject: Fixed: ptex drawing functions were overridden with standard drawing
X-Git-Tag: 062012170305~23459
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85243b8120c1a61c88e57b578ea927c322a5170b;p=profile%2Fivi%2Fmesa.git

Fixed: ptex drawing functions were overridden with standard drawing
functions if ANY_RASTER_FLAGS|ANY_FALLBACK_FLAGS were set.
---

diff --git a/src/mesa/drivers/dri/savage/savagetris.c b/src/mesa/drivers/dri/savage/savagetris.c
index 26388d1..52da161 100644
--- a/src/mesa/drivers/dri/savage/savagetris.c
+++ b/src/mesa/drivers/dri/savage/savagetris.c
@@ -712,13 +712,13 @@ static void savageChooseRenderState(GLcontext *ctx)
       imesa->draw_line = savage_ptex_line;
       imesa->draw_tri = savage_ptex_tri;
       index |= SAVAGE_FALLBACK_BIT;
-   }
-
-   if (flags & (ANY_RASTER_FLAGS|ANY_FALLBACK_FLAGS)) {
+   } else {
       imesa->draw_point = savage_draw_point;
       imesa->draw_line = savage_draw_line;
       imesa->draw_tri = savage_draw_triangle;
+   }
 
+   if (flags & (ANY_RASTER_FLAGS|ANY_FALLBACK_FLAGS)) {
       if (flags & ANY_RASTER_FLAGS) {
 	 if (flags & DD_TRI_LIGHT_TWOSIDE) index |= SAVAGE_TWOSIDE_BIT;
 	 if (flags & DD_TRI_OFFSET)        index |= SAVAGE_OFFSET_BIT;