commit efca5651464de0849e48743aab523ae178be354b
author Ben Clayton <bclayton@google.com> Mon Apr 13 08:24:45 2020 +0100
committer Ben Clayton <bclayton@google.com> Tue Apr 14 17:42:20 2020 +0000
tree 4a62359b4a05572642a159b8810dfb06614464fd
parent bc2af94feb4038664fe6744042cfa212088ccd86

Device: Rename RoutineCacheT to RoutineCache

`RoutineCache` was not used, remove it.
Rename `RoutineCacheT` to the now unused name `RoutineCache`.

Bug: b/126126820
Change-Id: I656c1727446754b2063033806634678b14485b6f
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43816
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/Device/Blitter.hpp

diff --git a/src/Device/Blitter.hpp b/src/Device/Blitter.hpp
index 8006945..50b7e29 100644
--- a/src/Device/Blitter.hpp
+++ b/src/Device/Blitter.hpp
@@ -186,9 +186,9 @@
 	                  const VkImageSubresourceLayers &srcSubresourceLayers, Edge srcEdge);
 
 	std::mutex blitMutex;
-	RoutineCacheT<State, BlitFunction::CFunctionType> blitCache;  // guarded by blitMutex
+	RoutineCache<State, BlitFunction::CFunctionType> blitCache;  // guarded by blitMutex
 	std::mutex cornerUpdateMutex;
-	RoutineCacheT<State, CornerUpdateFunction::CFunctionType> cornerUpdateCache;  // guarded by cornerUpdateMutex
+	RoutineCache<State, CornerUpdateFunction::CFunctionType> cornerUpdateCache;  // guarded by cornerUpdateMutex
 };
 
 }  // namespace sw

src/Device/PixelProcessor.hpp

diff --git a/src/Device/PixelProcessor.hpp b/src/Device/PixelProcessor.hpp
index 8416cc0..e92065d 100644
--- a/src/Device/PixelProcessor.hpp
+++ b/src/Device/PixelProcessor.hpp
@@ -159,7 +159,7 @@
 	Factor factor;
 
 private:
-	using RoutineCacheType = RoutineCacheT<State, RasterizerFunction::CFunctionType>;
+	using RoutineCacheType = RoutineCache<State, RasterizerFunction::CFunctionType>;
 	RoutineCacheType *routineCache;
 };
 

src/Device/RoutineCache.hpp

diff --git a/src/Device/RoutineCache.hpp b/src/Device/RoutineCache.hpp
index ce48e42..9bf2e31 100644
--- a/src/Device/RoutineCache.hpp
+++ b/src/Device/RoutineCache.hpp
@@ -23,11 +23,8 @@
 
 using namespace rr;
 
-template<class State>
-using RoutineCache = LRUCache<State, std::shared_ptr<Routine>>;
-
 template<class State, class FunctionType>
-using RoutineCacheT = LRUCache<State, RoutineT<FunctionType>>;
+using RoutineCache = LRUCache<State, RoutineT<FunctionType>>;
 
 }  // namespace sw
 

src/Device/SetupProcessor.hpp

diff --git a/src/Device/SetupProcessor.hpp b/src/Device/SetupProcessor.hpp
index 5224802..b8b6d84 100644
--- a/src/Device/SetupProcessor.hpp
+++ b/src/Device/SetupProcessor.hpp
@@ -79,7 +79,7 @@
 	void setRoutineCacheSize(int cacheSize);
 
 private:
-	using RoutineCacheType = RoutineCacheT<State, SetupFunction::CFunctionType>;
+	using RoutineCacheType = RoutineCache<State, SetupFunction::CFunctionType>;
 	RoutineCacheType *routineCache;
 };
 

src/Device/VertexProcessor.hpp

diff --git a/src/Device/VertexProcessor.hpp b/src/Device/VertexProcessor.hpp
index 5dbb232..739ffc6 100644
--- a/src/Device/VertexProcessor.hpp
+++ b/src/Device/VertexProcessor.hpp
@@ -100,7 +100,7 @@
 	void setRoutineCacheSize(int cacheSize);
 
 private:
-	using RoutineCacheType = RoutineCacheT<State, VertexRoutineFunction::CFunctionType>;
+	using RoutineCacheType = RoutineCache<State, VertexRoutineFunction::CFunctionType>;
 	RoutineCacheType *routineCache;
 };