diff options
| author | 2024-01-07 05:33:43 +0100 | |
|---|---|---|
| committer | 2024-01-18 21:12:30 -0500 | |
| commit | 23430e67724d803184b6a861e4bcb3cac0e38cb0 (patch) | |
| tree | 5d0b3dfc7175434f66d0dfb32f1d0bfa597013c4 /src/video_core/renderer_opengl | |
| parent | SMMU: Fix Right Shift UB. (diff) | |
| download | yuzu-23430e67724d803184b6a861e4bcb3cac0e38cb0.tar.gz yuzu-23430e67724d803184b6a861e4bcb3cac0e38cb0.tar.xz yuzu-23430e67724d803184b6a861e4bcb3cac0e38cb0.zip | |
Core: Eliminate core/memory dependancies.
Diffstat (limited to 'src/video_core/renderer_opengl')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 71b748c74..d5354ef2d 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -526,8 +526,8 @@ VideoCore::RasterizerDownloadArea RasterizerOpenGL::GetFlushArea(DAddr addr, u64 | |||
| 526 | } | 526 | } |
| 527 | } | 527 | } |
| 528 | VideoCore::RasterizerDownloadArea new_area{ | 528 | VideoCore::RasterizerDownloadArea new_area{ |
| 529 | .start_address = Common::AlignDown(addr, Core::Memory::YUZU_PAGESIZE), | 529 | .start_address = Common::AlignDown(addr, Core::DEVICE_PAGESIZE), |
| 530 | .end_address = Common::AlignUp(addr + size, Core::Memory::YUZU_PAGESIZE), | 530 | .end_address = Common::AlignUp(addr + size, Core::DEVICE_PAGESIZE), |
| 531 | .preemtive = true, | 531 | .preemtive = true, |
| 532 | }; | 532 | }; |
| 533 | return new_area; | 533 | return new_area; |
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 821a045ad..b75376fdb 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include "common/telemetry.h" | 15 | #include "common/telemetry.h" |
| 16 | #include "core/core_timing.h" | 16 | #include "core/core_timing.h" |
| 17 | #include "core/frontend/emu_window.h" | 17 | #include "core/frontend/emu_window.h" |
| 18 | #include "core/memory.h" | ||
| 19 | #include "core/telemetry_session.h" | 18 | #include "core/telemetry_session.h" |
| 20 | #include "video_core/host_shaders/ffx_a_h.h" | 19 | #include "video_core/host_shaders/ffx_a_h.h" |
| 21 | #include "video_core/host_shaders/ffx_fsr1_h.h" | 20 | #include "video_core/host_shaders/ffx_fsr1_h.h" |