diff options
| author | 2022-12-24 22:24:56 -0500 | |
|---|---|---|
| committer | 2023-01-01 16:43:58 -0500 | |
| commit | 4814d87385a3e06a70514be4ecb2739cba358bdf (patch) | |
| tree | c13a876c13fb53e8aceed2a6eaad925e1138f896 /src/video_core/renderer_vulkan | |
| parent | MacroHLE: Final cleanup and fixes. (diff) | |
| download | yuzu-4814d87385a3e06a70514be4ecb2739cba358bdf.tar.gz yuzu-4814d87385a3e06a70514be4ecb2739cba358bdf.tar.xz yuzu-4814d87385a3e06a70514be4ecb2739cba358bdf.zip | |
video_core: fix build
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_rasterizer.cpp | 8 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 3ab2defa2..da76b9a22 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp | |||
| @@ -229,9 +229,13 @@ void RasterizerVulkan::DrawIndirect() { | |||
| 229 | const auto& params = maxwell3d->draw_manager->GetIndirectParams(); | 229 | const auto& params = maxwell3d->draw_manager->GetIndirectParams(); |
| 230 | buffer_cache.SetDrawIndirect(¶ms); | 230 | buffer_cache.SetDrawIndirect(¶ms); |
| 231 | PrepareDraw(params.is_indexed, [this, ¶ms] { | 231 | PrepareDraw(params.is_indexed, [this, ¶ms] { |
| 232 | const auto [buffer, offset] = buffer_cache.GetDrawIndirectBuffer(); | 232 | const auto indirect_buffer = buffer_cache.GetDrawIndirectBuffer(); |
| 233 | const auto& buffer = indirect_buffer.first; | ||
| 234 | const auto& offset = indirect_buffer.second; | ||
| 233 | if (params.include_count) { | 235 | if (params.include_count) { |
| 234 | const auto [draw_buffer, offset_base] = buffer_cache.GetDrawIndirectCount(); | 236 | const auto count = buffer_cache.GetDrawIndirectCount(); |
| 237 | const auto& draw_buffer = count.first; | ||
| 238 | const auto& offset_base = count.second; | ||
| 235 | scheduler.Record([draw_buffer_obj = draw_buffer->Handle(), | 239 | scheduler.Record([draw_buffer_obj = draw_buffer->Handle(), |
| 236 | buffer_obj = buffer->Handle(), offset_base, offset, | 240 | buffer_obj = buffer->Handle(), offset_base, offset, |
| 237 | params](vk::CommandBuffer cmdbuf) { | 241 | params](vk::CommandBuffer cmdbuf) { |
diff --git a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp index 202806331..66d2e6a70 100644 --- a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp | |||
| @@ -199,6 +199,9 @@ StagingBufferRef StagingBufferPool::GetStreamBuffer(size_t size) { | |||
| 199 | .buffer = *stream_buffer, | 199 | .buffer = *stream_buffer, |
| 200 | .offset = static_cast<VkDeviceSize>(offset), | 200 | .offset = static_cast<VkDeviceSize>(offset), |
| 201 | .mapped_span = std::span<u8>(stream_pointer + offset, size), | 201 | .mapped_span = std::span<u8>(stream_pointer + offset, size), |
| 202 | .usage{}, | ||
| 203 | .log2_level{}, | ||
| 204 | .index{}, | ||
| 202 | }; | 205 | }; |
| 203 | } | 206 | } |
| 204 | 207 | ||