diff options
Diffstat (limited to 'src/video_core/renderer_vulkan')
4 files changed, 5 insertions, 6 deletions
diff --git a/src/video_core/renderer_vulkan/pipeline_helper.h b/src/video_core/renderer_vulkan/pipeline_helper.h index 71c783709..850c34a3a 100644 --- a/src/video_core/renderer_vulkan/pipeline_helper.h +++ b/src/video_core/renderer_vulkan/pipeline_helper.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include "shader_recompiler/shader_info.h" | 12 | #include "shader_recompiler/shader_info.h" |
| 13 | #include "video_core/renderer_vulkan/vk_texture_cache.h" | 13 | #include "video_core/renderer_vulkan/vk_texture_cache.h" |
| 14 | #include "video_core/renderer_vulkan/vk_update_descriptor.h" | 14 | #include "video_core/renderer_vulkan/vk_update_descriptor.h" |
| 15 | #include "video_core/texture_cache/texture_cache.h" | ||
| 16 | #include "video_core/texture_cache/types.h" | 15 | #include "video_core/texture_cache/types.h" |
| 17 | #include "video_core/vulkan_common/vulkan_device.h" | 16 | #include "video_core/vulkan_common/vulkan_device.h" |
| 18 | 17 | ||
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index f2fd2670f..ec6b3a4b0 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include "video_core/renderer_vulkan/vk_texture_cache.h" | 19 | #include "video_core/renderer_vulkan/vk_texture_cache.h" |
| 20 | #include "video_core/renderer_vulkan/vk_update_descriptor.h" | 20 | #include "video_core/renderer_vulkan/vk_update_descriptor.h" |
| 21 | #include "video_core/shader_notify.h" | 21 | #include "video_core/shader_notify.h" |
| 22 | #include "video_core/texture_cache/texture_cache.h" | ||
| 22 | #include "video_core/vulkan_common/vulkan_device.h" | 23 | #include "video_core/vulkan_common/vulkan_device.h" |
| 23 | 24 | ||
| 24 | #if defined(_MSC_VER) && defined(NDEBUG) | 25 | #if defined(_MSC_VER) && defined(NDEBUG) |
diff --git a/src/video_core/renderer_vulkan/vk_query_cache.cpp b/src/video_core/renderer_vulkan/vk_query_cache.cpp index 522f92dae..7cbc9c73c 100644 --- a/src/video_core/renderer_vulkan/vk_query_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_query_cache.cpp | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #include "common/bit_util.h" | 14 | #include "common/bit_util.h" |
| 15 | #include "common/common_types.h" | 15 | #include "common/common_types.h" |
| 16 | #include "core/memory.h" | ||
| 17 | #include "video_core/engines/draw_manager.h" | 16 | #include "video_core/engines/draw_manager.h" |
| 18 | #include "video_core/host1x/gpu_device_memory_manager.h" | 17 | #include "video_core/host1x/gpu_device_memory_manager.h" |
| 19 | #include "video_core/query_cache/query_cache.h" | 18 | #include "video_core/query_cache/query_cache.h" |
| @@ -1482,8 +1481,8 @@ void QueryCacheRuntime::SyncValues(std::span<SyncValuesType> values, VkBuffer ba | |||
| 1482 | for (auto& sync_val : values) { | 1481 | for (auto& sync_val : values) { |
| 1483 | total_size += sync_val.size; | 1482 | total_size += sync_val.size; |
| 1484 | bool found = false; | 1483 | bool found = false; |
| 1485 | DAddr base = Common::AlignDown(sync_val.address, Core::Memory::YUZU_PAGESIZE); | 1484 | DAddr base = Common::AlignDown(sync_val.address, Core::DEVICE_PAGESIZE); |
| 1486 | DAddr base_end = base + Core::Memory::YUZU_PAGESIZE; | 1485 | DAddr base_end = base + Core::DEVICE_PAGESIZE; |
| 1487 | for (size_t i = 0; i < impl->little_cache.size(); i++) { | 1486 | for (size_t i = 0; i < impl->little_cache.size(); i++) { |
| 1488 | const auto set_found = [&] { | 1487 | const auto set_found = [&] { |
| 1489 | impl->redirect_cache.push_back(i); | 1488 | impl->redirect_cache.push_back(i); |
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 874927311..5bf41b81f 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp | |||
| @@ -553,8 +553,8 @@ VideoCore::RasterizerDownloadArea RasterizerVulkan::GetFlushArea(DAddr addr, u64 | |||
| 553 | } | 553 | } |
| 554 | } | 554 | } |
| 555 | VideoCore::RasterizerDownloadArea new_area{ | 555 | VideoCore::RasterizerDownloadArea new_area{ |
| 556 | .start_address = Common::AlignDown(addr, Core::Memory::YUZU_PAGESIZE), | 556 | .start_address = Common::AlignDown(addr, Core::DEVICE_PAGESIZE), |
| 557 | .end_address = Common::AlignUp(addr + size, Core::Memory::YUZU_PAGESIZE), | 557 | .end_address = Common::AlignUp(addr + size, Core::DEVICE_PAGESIZE), |
| 558 | .preemtive = true, | 558 | .preemtive = true, |
| 559 | }; | 559 | }; |
| 560 | return new_area; | 560 | return new_area; |