From: Tim Rowley <timothy.o.rowley@intel.com>
Date: Mon, 2 May 2016 19:35:25 +0000 (-0600)
Subject: swr: [rasterizer] Small warning cleanup
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2be7c3e780977678eb423e75cf063f92f7d03916;p=mesa.git

swr: [rasterizer] Small warning cleanup

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
---

diff --git a/src/gallium/drivers/swr/rasterizer/core/frontend.cpp b/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
index 4d5afea5d32..08346106fbf 100644
--- a/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
+++ b/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
@@ -1125,7 +1125,10 @@ static void TessellationStages(
                 {
                     simdvector prim[3]; // Only deal with triangles, lines, or points
                     RDTSC_START(FEPAAssemble);
-                    bool assemble = tessPa.Assemble(VERTEX_POSITION_SLOT, prim);
+#if SWR_ENABLE_ASSERTS
+                    bool assemble =
+#endif
+                        tessPa.Assemble(VERTEX_POSITION_SLOT, prim);
                     RDTSC_STOP(FEPAAssemble, 1, 0);
                     SWR_ASSERT(assemble);
 
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h
index 9861eae78aa..14ba893fc25 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h
@@ -163,13 +163,6 @@ struct JitManager
     StructType*          mV4FP32Ty;
     StructType*          mV4Int32Ty;
 
-    // helper scalar function types
-    FunctionType* mUnaryFPTy;
-    FunctionType* mBinaryFPTy;
-    FunctionType* mTrinaryFPTy;
-    FunctionType* mUnaryIntTy;
-    FunctionType* mBinaryIntTy;
-
     Type* mSimtFP32Ty;
     Type* mSimtInt32Ty;