summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl/gl_rasterizer.cpp
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-01-21 20:38:23 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-02-07 02:23:40 +0100
commiteb7324743372d3b94db9a915a5508d8293d45ecb (patch)
tree085261558efeb2b47ce5316b52314980005b3e5c /src/video_core/renderer_opengl/gl_rasterizer.cpp
parentgl_shader_cache: Set GL_PROGRAM_SEPARABLE to dumped shaders (diff)
downloadyuzu-eb7324743372d3b94db9a915a5508d8293d45ecb.tar
yuzu-eb7324743372d3b94db9a915a5508d8293d45ecb.tar.gz
yuzu-eb7324743372d3b94db9a915a5508d8293d45ecb.tar.bz2
yuzu-eb7324743372d3b94db9a915a5508d8293d45ecb.tar.lz
yuzu-eb7324743372d3b94db9a915a5508d8293d45ecb.tar.xz
yuzu-eb7324743372d3b94db9a915a5508d8293d45ecb.tar.zst
yuzu-eb7324743372d3b94db9a915a5508d8293d45ecb.zip
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 94a5058de..974ca6a20 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -449,7 +449,7 @@ static constexpr auto RangeFromInterval(Map& map, const Interval& interval) {
return boost::make_iterator_range(map.equal_range(interval));
}
-void RasterizerOpenGL::UpdatePagesCachedCount(VAddr addr, u64 size, int delta) {
+void RasterizerOpenGL::UpdatePagesCachedCount(Tegra::GPUVAddr addr, u64 size, int delta) {
const u64 page_start{addr >> Memory::PAGE_BITS};
const u64 page_end{(addr + size + Memory::PAGE_SIZE - 1) >> Memory::PAGE_BITS};
@@ -479,8 +479,9 @@ void RasterizerOpenGL::UpdatePagesCachedCount(VAddr addr, u64 size, int delta) {
cached_pages.add({pages_interval, delta});
}
-void RasterizerOpenGL::LoadDiskResources() {
- shader_cache.LoadDiskCache();
+void RasterizerOpenGL::LoadDiskResources(const std::atomic_bool& stop_loading,
+ const VideoCore::DiskResourceLoadCallback& callback) {
+ shader_cache.LoadDiskCache(stop_loading, callback);
}
std::pair<bool, bool> RasterizerOpenGL::ConfigureFramebuffers(