Fixed a segfault related to the PTEX fallback.

2 files changed, 6 insertions, 2 deletions

diff --git a/xc/lib/GL/mesa/src/drv/savage/savagetris.c b/xc/lib/GL/mesa/src/drv/savage/savagetris.c
index 101731aed..2da9a0c23 100755
--- a/xc/lib/GL/mesa/src/drv/savage/savagetris.c
+++ b/xc/lib/GL/mesa/src/drv/savage/savagetris.c
@@ -739,8 +739,10 @@ static void savageRenderStart( GLcontext *ctx )
     */
    savageCheckTexSizes( ctx );
 
-   /* Update hardware state and get the lock */
-   savageDDRenderStart( ctx );
+   if (!SAVAGE_CONTEXT(ctx)->Fallback) {
+      /* Update hardware state and get the lock */
+      savageDDRenderStart( ctx );
+   }
 }
 
 static void savageRenderFinish( GLcontext *ctx )
diff --git a/xc/lib/GL/mesa/src/drv/savage/savagevb.c b/xc/lib/GL/mesa/src/drv/savage/savagevb.c
index c47e56cf9..f2f237c1f 100755
--- a/xc/lib/GL/mesa/src/drv/savage/savagevb.c
+++ b/xc/lib/GL/mesa/src/drv/savage/savagevb.c
@@ -346,6 +346,8 @@ void savageCheckTexSizes( GLcontext *ctx )
 	 tnl->Driver.Render.Interp = setup_tab[imesa->SetupIndex].interp;
 	 tnl->Driver.Render.CopyPV = setup_tab[imesa->SetupIndex].copy_pv;
       }
+      if (imesa->Fallback)
+	 tnl->Driver.Render.Start(ctx);
    }
 }