Remove precacheDLL
Remove leftover variables not cleaned up in:
https://swiftshader-review.googlesource.com/c/SwiftShader/+/7250
Change-Id: Ia2e66c15e5cadeed32f564c60d5105c17319e9d4
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27028
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Device/PixelProcessor.cpp b/src/Device/PixelProcessor.cpp
index b1f2843..c55dd5d 100644
--- a/src/Device/PixelProcessor.cpp
+++ b/src/Device/PixelProcessor.cpp
@@ -352,7 +352,7 @@
void PixelProcessor::setRoutineCacheSize(int cacheSize)
{
delete routineCache;
- routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536), precachePixel ? "sw-pixel" : 0);
+ routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536));
}
const PixelProcessor::State PixelProcessor::update() const
diff --git a/src/Device/RoutineCache.hpp b/src/Device/RoutineCache.hpp
index 3904acc..8420468 100644
--- a/src/Device/RoutineCache.hpp
+++ b/src/Device/RoutineCache.hpp
@@ -24,28 +24,7 @@
using namespace rr;
template<class State>
- class RoutineCache : public LRUCache<State, Routine>
- {
- public:
- RoutineCache(int n, const char *precache = 0);
- ~RoutineCache();
-
- private:
- const char *precache;
- #if defined(_WIN32)
- HMODULE precacheDLL;
- #endif
- };
-
- template<class State>
- RoutineCache<State>::RoutineCache(int n, const char *precache) : LRUCache<State, Routine>(n), precache(precache)
- {
- }
-
- template<class State>
- RoutineCache<State>::~RoutineCache()
- {
- }
+ using RoutineCache = LRUCache<State, Routine>;
}
#endif // sw_RoutineCache_hpp
diff --git a/src/Device/SetupProcessor.cpp b/src/Device/SetupProcessor.cpp
index 719fb95..7af4d3a 100644
--- a/src/Device/SetupProcessor.cpp
+++ b/src/Device/SetupProcessor.cpp
@@ -120,6 +120,6 @@
void SetupProcessor::setRoutineCacheSize(int cacheSize)
{
delete routineCache;
- routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536), precacheSetup ? "sw-setup" : 0);
+ routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536));
}
}
diff --git a/src/Device/VertexProcessor.cpp b/src/Device/VertexProcessor.cpp
index 21ab83f..47ce148 100644
--- a/src/Device/VertexProcessor.cpp
+++ b/src/Device/VertexProcessor.cpp
@@ -94,7 +94,7 @@
void VertexProcessor::setRoutineCacheSize(int cacheSize)
{
delete routineCache;
- routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536), precacheVertex ? "sw-vertex" : 0);
+ routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536));
}
const VertexProcessor::State VertexProcessor::update(DrawType drawType)
diff --git a/src/Renderer/PixelProcessor.cpp b/src/Renderer/PixelProcessor.cpp
index 1a158a7..133f90c 100644
--- a/src/Renderer/PixelProcessor.cpp
+++ b/src/Renderer/PixelProcessor.cpp
@@ -933,7 +933,7 @@
void PixelProcessor::setRoutineCacheSize(int cacheSize)
{
delete routineCache;
- routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536), precachePixel ? "sw-pixel" : 0);
+ routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536));
}
void PixelProcessor::setFogRanges(float start, float end)
diff --git a/src/Renderer/RoutineCache.hpp b/src/Renderer/RoutineCache.hpp
index 3338f85..8420468 100644
--- a/src/Renderer/RoutineCache.hpp
+++ b/src/Renderer/RoutineCache.hpp
@@ -24,28 +24,7 @@
using namespace rr;
template<class State>
- class RoutineCache : public LRUCache<State, Routine>
- {
- public:
- RoutineCache(int n, const char *precache = nullptr);
- ~RoutineCache();
-
- private:
- const char *precache;
- #if defined(_WIN32)
- HMODULE precacheDLL;
- #endif
- };
-
- template<class State>
- RoutineCache<State>::RoutineCache(int n, const char *precache) : LRUCache<State, Routine>(n), precache(precache)
- {
- }
-
- template<class State>
- RoutineCache<State>::~RoutineCache()
- {
- }
+ using RoutineCache = LRUCache<State, Routine>;
}
#endif // sw_RoutineCache_hpp
diff --git a/src/Renderer/SetupProcessor.cpp b/src/Renderer/SetupProcessor.cpp
index c5c2a16..7211406 100644
--- a/src/Renderer/SetupProcessor.cpp
+++ b/src/Renderer/SetupProcessor.cpp
@@ -243,6 +243,6 @@
void SetupProcessor::setRoutineCacheSize(int cacheSize)
{
delete routineCache;
- routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536), precacheSetup ? "sw-setup" : 0);
+ routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536));
}
}
diff --git a/src/Renderer/VertexProcessor.cpp b/src/Renderer/VertexProcessor.cpp
index 8321e6d..463393a 100644
--- a/src/Renderer/VertexProcessor.cpp
+++ b/src/Renderer/VertexProcessor.cpp
@@ -899,7 +899,7 @@
void VertexProcessor::setRoutineCacheSize(int cacheSize)
{
delete routineCache;
- routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536), precacheVertex ? "sw-vertex" : 0);
+ routineCache = new RoutineCache<State>(clamp(cacheSize, 1, 65536));
}
const VertexProcessor::State VertexProcessor::update(DrawType drawType)
