diff options
| author | 2020-02-18 16:51:42 -0400 | |
|---|---|---|
| committer | 2020-04-22 11:36:04 -0400 | |
| commit | 084ceb925acad470b69467d64e4dfbb3bd7ef3f1 (patch) | |
| tree | 3e4dcc3a3671b85cb3ac5f812159974c006e3c47 /src/video_core | |
| parent | Merge pull request #3714 from lioncash/copies (diff) | |
| download | yuzu-084ceb925acad470b69467d64e4dfbb3bd7ef3f1.tar.gz yuzu-084ceb925acad470b69467d64e4dfbb3bd7ef3f1.tar.xz yuzu-084ceb925acad470b69467d64e4dfbb3bd7ef3f1.zip | |
UI: Replasce accurate GPU option for GPU Accuracy Level
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/engines/maxwell_dma.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/engines/maxwell_dma.cpp b/src/video_core/engines/maxwell_dma.cpp index c2610f992..32b04e31e 100644 --- a/src/video_core/engines/maxwell_dma.cpp +++ b/src/video_core/engines/maxwell_dma.cpp | |||
| @@ -136,7 +136,7 @@ void MaxwellDMA::HandleCopy() { | |||
| 136 | write_buffer.resize(dst_size); | 136 | write_buffer.resize(dst_size); |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | if (Settings::values.use_accurate_gpu_emulation) { | 139 | if (Settings::IsGPULevelExtreme()) { |
| 140 | memory_manager.ReadBlock(source, read_buffer.data(), src_size); | 140 | memory_manager.ReadBlock(source, read_buffer.data(), src_size); |
| 141 | memory_manager.ReadBlock(dest, write_buffer.data(), dst_size); | 141 | memory_manager.ReadBlock(dest, write_buffer.data(), dst_size); |
| 142 | } else { | 142 | } else { |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 175374f0d..ac4485a18 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -661,7 +661,7 @@ void RasterizerOpenGL::InvalidateRegion(VAddr addr, u64 size) { | |||
| 661 | } | 661 | } |
| 662 | 662 | ||
| 663 | void RasterizerOpenGL::FlushAndInvalidateRegion(VAddr addr, u64 size) { | 663 | void RasterizerOpenGL::FlushAndInvalidateRegion(VAddr addr, u64 size) { |
| 664 | if (Settings::values.use_accurate_gpu_emulation) { | 664 | if (Settings::IsGPULevelExtreme()) { |
| 665 | FlushRegion(addr, size); | 665 | FlushRegion(addr, size); |
| 666 | } | 666 | } |
| 667 | InvalidateRegion(addr, size); | 667 | InvalidateRegion(addr, size); |
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 69ca08fd1..7432691d1 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h | |||
| @@ -417,7 +417,7 @@ private: | |||
| 417 | **/ | 417 | **/ |
| 418 | RecycleStrategy PickStrategy(std::vector<TSurface>& overlaps, const SurfaceParams& params, | 418 | RecycleStrategy PickStrategy(std::vector<TSurface>& overlaps, const SurfaceParams& params, |
| 419 | const GPUVAddr gpu_addr, const MatchTopologyResult untopological) { | 419 | const GPUVAddr gpu_addr, const MatchTopologyResult untopological) { |
| 420 | if (Settings::values.use_accurate_gpu_emulation) { | 420 | if (Settings::IsGPULevelExtreme()) { |
| 421 | return RecycleStrategy::Flush; | 421 | return RecycleStrategy::Flush; |
| 422 | } | 422 | } |
| 423 | // 3D Textures decision | 423 | // 3D Textures decision |
| @@ -461,7 +461,7 @@ private: | |||
| 461 | } | 461 | } |
| 462 | switch (PickStrategy(overlaps, params, gpu_addr, untopological)) { | 462 | switch (PickStrategy(overlaps, params, gpu_addr, untopological)) { |
| 463 | case RecycleStrategy::Ignore: { | 463 | case RecycleStrategy::Ignore: { |
| 464 | return InitializeSurface(gpu_addr, params, Settings::values.use_accurate_gpu_emulation); | 464 | return InitializeSurface(gpu_addr, params, Settings::IsGPULevelExtreme()); |
| 465 | } | 465 | } |
| 466 | case RecycleStrategy::Flush: { | 466 | case RecycleStrategy::Flush: { |
| 467 | std::sort(overlaps.begin(), overlaps.end(), | 467 | std::sort(overlaps.begin(), overlaps.end(), |
| @@ -598,7 +598,7 @@ private: | |||
| 598 | if (passed_tests == 0) { | 598 | if (passed_tests == 0) { |
| 599 | return {}; | 599 | return {}; |
| 600 | // In Accurate GPU all tests should pass, else we recycle | 600 | // In Accurate GPU all tests should pass, else we recycle |
| 601 | } else if (Settings::values.use_accurate_gpu_emulation && passed_tests != overlaps.size()) { | 601 | } else if (Settings::IsGPULevelExtreme() && passed_tests != overlaps.size()) { |
| 602 | return {}; | 602 | return {}; |
| 603 | } | 603 | } |
| 604 | for (const auto& surface : overlaps) { | 604 | for (const auto& surface : overlaps) { |
| @@ -668,7 +668,7 @@ private: | |||
| 668 | for (const auto& surface : overlaps) { | 668 | for (const auto& surface : overlaps) { |
| 669 | if (!surface->MatchTarget(params.target)) { | 669 | if (!surface->MatchTarget(params.target)) { |
| 670 | if (overlaps.size() == 1 && surface->GetCpuAddr() == cpu_addr) { | 670 | if (overlaps.size() == 1 && surface->GetCpuAddr() == cpu_addr) { |
| 671 | if (Settings::values.use_accurate_gpu_emulation) { | 671 | if (Settings::IsGPULevelExtreme()) { |
| 672 | return std::nullopt; | 672 | return std::nullopt; |
| 673 | } | 673 | } |
| 674 | Unregister(surface); | 674 | Unregister(surface); |