From: Nicolas Capens <capn@google.com>
Date: Thu, 23 Jun 2016 20:23:13 +0000 (-0400)
Subject: Fix retaining the processing routines when no update.
X-Git-Tag: android-x86-7.1-r1~447
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=183949cd3cd17bf1ce99797b005f78c270cbd39a;p=android-x86%2Fexternal-swiftshader.git

Fix retaining the processing routines when no update.

Change-Id: I891c320662b046a1a4a94cf24b86b386f2fdf66e
Reviewed-on: https://swiftshader-review.googlesource.com/5690
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
---

diff --git a/src/Renderer/Renderer.cpp b/src/Renderer/Renderer.cpp
index 7e7ec40ed..b6ce8024f 100644
--- a/src/Renderer/Renderer.cpp
+++ b/src/Renderer/Renderer.cpp
@@ -234,10 +234,6 @@ namespace sw
 
 			sync->lock(sw::PRIVATE);
 
-			Routine *vertexRoutine;
-			Routine *setupRoutine;
-			Routine *pixelRoutine;
-
 			if(update || oldMultiSampleMask != context->multiSampleMask)
 			{
 				vertexState = VertexProcessor::update(drawType);
diff --git a/src/Renderer/Renderer.hpp b/src/Renderer/Renderer.hpp
index 41d06e0e4..dc644e14a 100644
--- a/src/Renderer/Renderer.hpp
+++ b/src/Renderer/Renderer.hpp
@@ -480,6 +480,10 @@ namespace sw
 		VertexProcessor::State vertexState;
 		SetupProcessor::State setupState;
 		PixelProcessor::State pixelState;
+
+		Routine *vertexRoutine;
+		Routine *setupRoutine;
+		Routine *pixelRoutine;
 	};
 }