From 85243b8120c1a61c88e57b578ea927c322a5170b Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Fri, 7 Jan 2005 10:55:13 +0000 Subject: [PATCH] Fixed: ptex drawing functions were overridden with standard drawing functions if ANY_RASTER_FLAGS|ANY_FALLBACK_FLAGS were set. --- src/mesa/drivers/dri/savage/savagetris.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; -- 2.7.4