summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Kuehling <[email protected]>2005-01-07 10:55:13 +0000
committerFelix Kuehling <[email protected]>2005-01-07 10:55:13 +0000
commit85243b8120c1a61c88e57b578ea927c322a5170b (patch)
tree3a7230da9596e9dc646c7f7f712db8bd25e0091f
parentb3d772bd9a09cfdcfbbf31c54d888d88311318ee (diff)
Fixed: ptex drawing functions were overridden with standard drawing
functions if ANY_RASTER_FLAGS|ANY_FALLBACK_FLAGS were set.
-rw-r--r--src/mesa/drivers/dri/savage/savagetris.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/savage/savagetris.c b/src/mesa/drivers/dri/savage/savagetris.c
index 26388d1149f..52da161d7e3 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;