diff options
| author |  Rodrigo Locatti | 2020-04-16 01:22:50 -0300 |
|---|---|---|
| committer |  GitHub | 2020-04-16 01:22:50 -0300 |
| commit | 60e8de7c95fff9ebe4ab6aa51c437d56e2167585 (patch) | |
| tree | 8dccee8fe8712b83f1d07252c9070939047b8f00 | |
| parent | Merge pull request #3685 from lioncash/copies (diff) | |
| parent | surface_base: Make IsInside() a const member function (diff) | |
| download | yuzu-60e8de7c95fff9ebe4ab6aa51c437d56e2167585.tar.gz yuzu-60e8de7c95fff9ebe4ab6aa51c437d56e2167585.tar.xz yuzu-60e8de7c95fff9ebe4ab6aa51c437d56e2167585.zip | |
Merge pull request #3687 from lioncash/constness
surface_base: Make IsInside() a const member function
| -rw-r--r-- | src/video_core/texture_cache/surface_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/texture_cache/surface_base.h b/src/video_core/texture_cache/surface_base.h index a39a8661b..c5ab21f56 100644 --- a/src/video_core/texture_cache/surface_base.h +++ b/src/video_core/texture_cache/surface_base.h | |||
| @@ -72,9 +72,9 @@ public: | |||
| 72 | return (cpu_addr < end) && (cpu_addr_end > start); | 72 | return (cpu_addr < end) && (cpu_addr_end > start); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | bool IsInside(const GPUVAddr other_start, const GPUVAddr other_end) { | 75 | bool IsInside(const GPUVAddr other_start, const GPUVAddr other_end) const { |
| 76 | const GPUVAddr gpu_addr_end = gpu_addr + guest_memory_size; | 76 | const GPUVAddr gpu_addr_end = gpu_addr + guest_memory_size; |
| 77 | return (gpu_addr <= other_start && other_end <= gpu_addr_end); | 77 | return gpu_addr <= other_start && other_end <= gpu_addr_end; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | // Use only when recycling a surface | 80 | // Use only when recycling a surface |