diff options
| author | 2019-06-20 21:22:20 -0400 | |
|---|---|---|
| committer | 2019-06-20 21:24:47 -0400 | |
| commit | d1812316e1b0f03af2ba10d4fe04be728e72725c (patch) | |
| tree | 10fb4e292fdfc9346246895dc80343edc3ed766f /src/video_core/texture_cache | |
| parent | shader_cache: Correct versioning and size calculation. (diff) | |
| download | yuzu-d1812316e1b0f03af2ba10d4fe04be728e72725c.tar.gz yuzu-d1812316e1b0f03af2ba10d4fe04be728e72725c.tar.xz yuzu-d1812316e1b0f03af2ba10d4fe04be728e72725c.zip | |
texture_cache: Style and Corrections
Diffstat (limited to 'src/video_core/texture_cache')
| -rw-r--r-- | src/video_core/texture_cache/surface_base.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/texture_cache/surface_base.h | 3 | ||||
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/texture_cache/surface_base.cpp b/src/video_core/texture_cache/surface_base.cpp index 97bf9ad7a..051014c6a 100644 --- a/src/video_core/texture_cache/surface_base.cpp +++ b/src/video_core/texture_cache/surface_base.cpp | |||
| @@ -101,7 +101,7 @@ MatchStructureResult SurfaceBaseImpl::MatchesStructure(const SurfaceParams& rhs) | |||
| 101 | std::optional<std::pair<u32, u32>> SurfaceBaseImpl::GetLayerMipmap( | 101 | std::optional<std::pair<u32, u32>> SurfaceBaseImpl::GetLayerMipmap( |
| 102 | const GPUVAddr candidate_gpu_addr) const { | 102 | const GPUVAddr candidate_gpu_addr) const { |
| 103 | if (gpu_addr == candidate_gpu_addr) { | 103 | if (gpu_addr == candidate_gpu_addr) { |
| 104 | return {{0,0}}; | 104 | return {{0, 0}}; |
| 105 | } | 105 | } |
| 106 | if (candidate_gpu_addr < gpu_addr) { | 106 | if (candidate_gpu_addr < gpu_addr) { |
| 107 | return {}; | 107 | return {}; |
diff --git a/src/video_core/texture_cache/surface_base.h b/src/video_core/texture_cache/surface_base.h index 662221adc..252b18538 100644 --- a/src/video_core/texture_cache/surface_base.h +++ b/src/video_core/texture_cache/surface_base.h | |||
| @@ -254,7 +254,8 @@ public: | |||
| 254 | } | 254 | } |
| 255 | return {}; | 255 | return {}; |
| 256 | } else { | 256 | } else { |
| 257 | return GetView(ViewParams(view_params.target, layer, 1, mipmap, end_mipmap - mipmap + 1)); | 257 | return GetView( |
| 258 | ViewParams(view_params.target, layer, 1, mipmap, end_mipmap - mipmap + 1)); | ||
| 258 | } | 259 | } |
| 259 | } | 260 | } |
| 260 | 261 | ||
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index d86ddeb76..b720856f2 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include "common/common_types.h" | 18 | #include "common/common_types.h" |
| 19 | #include "common/math_util.h" | 19 | #include "common/math_util.h" |
| 20 | #include "core/memory.h" | 20 | #include "core/memory.h" |
| 21 | #include "core/settings.h" | ||
| 21 | #include "video_core/engines/fermi_2d.h" | 22 | #include "video_core/engines/fermi_2d.h" |
| 22 | #include "video_core/engines/maxwell_3d.h" | 23 | #include "video_core/engines/maxwell_3d.h" |
| 23 | #include "video_core/gpu.h" | 24 | #include "video_core/gpu.h" |