diff options
| author | 2022-12-24 19:19:41 -0500 | |
|---|---|---|
| committer | 2023-01-01 16:43:58 -0500 | |
| commit | d09aa0182f18d1ac338ab47009b42fdeb67497a8 (patch) | |
| tree | 1b3ae726f7aaa465b30fba795cfca0ae88d2140b /src/video_core/renderer_vulkan | |
| parent | Rasterizer: Setup skeleton for Host Conditional rendering (diff) | |
| download | yuzu-d09aa0182f18d1ac338ab47009b42fdeb67497a8.tar.gz yuzu-d09aa0182f18d1ac338ab47009b42fdeb67497a8.tar.xz yuzu-d09aa0182f18d1ac338ab47009b42fdeb67497a8.zip | |
MacroHLE: Final cleanup and fixes.
Diffstat (limited to 'src/video_core/renderer_vulkan')
4 files changed, 10 insertions, 12 deletions
diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.h b/src/video_core/renderer_vulkan/fixed_pipeline_state.h index f47406347..98ea20b42 100644 --- a/src/video_core/renderer_vulkan/fixed_pipeline_state.h +++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.h | |||
| @@ -164,7 +164,8 @@ struct FixedPipelineState { | |||
| 164 | }; | 164 | }; |
| 165 | 165 | ||
| 166 | void Refresh(const Maxwell& regs); | 166 | void Refresh(const Maxwell& regs); |
| 167 | void Refresh2(const Maxwell& regs, Maxwell::PrimitiveTopology topology, bool base_feautures_supported); | 167 | void Refresh2(const Maxwell& regs, Maxwell::PrimitiveTopology topology, |
| 168 | bool base_feautures_supported); | ||
| 168 | void Refresh3(const Maxwell& regs); | 169 | void Refresh3(const Maxwell& regs); |
| 169 | 170 | ||
| 170 | Maxwell::ComparisonOp DepthTestFunc() const noexcept { | 171 | Maxwell::ComparisonOp DepthTestFunc() const noexcept { |
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index c69ebe396..d11383bf1 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | |||
| @@ -227,7 +227,8 @@ struct DefaultSpec { | |||
| 227 | 227 | ||
| 228 | ConfigureFuncPtr ConfigureFunc(const std::array<vk::ShaderModule, NUM_STAGES>& modules, | 228 | ConfigureFuncPtr ConfigureFunc(const std::array<vk::ShaderModule, NUM_STAGES>& modules, |
| 229 | const std::array<Shader::Info, NUM_STAGES>& infos) { | 229 | const std::array<Shader::Info, NUM_STAGES>& infos) { |
| 230 | return FindSpec<SimpleVertexSpec, SimpleVertexFragmentSpec, SimpleStorageSpec, SimpleImageSpec, DefaultSpec>(modules, infos); | 230 | return FindSpec<SimpleVertexSpec, SimpleVertexFragmentSpec, SimpleStorageSpec, SimpleImageSpec, |
| 231 | DefaultSpec>(modules, infos); | ||
| 231 | } | 232 | } |
| 232 | } // Anonymous namespace | 233 | } // Anonymous namespace |
| 233 | 234 | ||
| @@ -505,11 +506,9 @@ void GraphicsPipeline::ConfigureDraw(const RescalingPushConstant& rescaling, | |||
| 505 | if (bind_pipeline) { | 506 | if (bind_pipeline) { |
| 506 | cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, *pipeline); | 507 | cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, *pipeline); |
| 507 | } | 508 | } |
| 508 | if (is_rescaling) { | 509 | cmdbuf.PushConstants(*pipeline_layout, VK_SHADER_STAGE_ALL_GRAPHICS, |
| 509 | cmdbuf.PushConstants(*pipeline_layout, VK_SHADER_STAGE_ALL_GRAPHICS, | 510 | RESCALING_LAYOUT_WORDS_OFFSET, sizeof(rescaling_data), |
| 510 | RESCALING_LAYOUT_WORDS_OFFSET, sizeof(rescaling_data), | 511 | rescaling_data.data()); |
| 511 | rescaling_data.data()); | ||
| 512 | } | ||
| 513 | if (update_rescaling) { | 512 | if (update_rescaling) { |
| 514 | const f32 config_down_factor{Settings::values.resolution_info.down_factor}; | 513 | const f32 config_down_factor{Settings::values.resolution_info.down_factor}; |
| 515 | const f32 scale_down_factor{is_rescaling ? config_down_factor : 1.0f}; | 514 | const f32 scale_down_factor{is_rescaling ? config_down_factor : 1.0f}; |
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.h b/src/video_core/renderer_vulkan/vk_rasterizer.h index c06182807..c661e5b19 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.h +++ b/src/video_core/renderer_vulkan/vk_rasterizer.h | |||
| @@ -89,8 +89,7 @@ public: | |||
| 89 | void SignalReference() override; | 89 | void SignalReference() override; |
| 90 | void ReleaseFences() override; | 90 | void ReleaseFences() override; |
| 91 | void FlushAndInvalidateRegion( | 91 | void FlushAndInvalidateRegion( |
| 92 | VAddr addr, u64 size, | 92 | VAddr addr, u64 size, VideoCommon::CacheType which = VideoCommon::CacheType::All) override; |
| 93 | VideoCommon::CacheType which = VideoCommon::CacheType::All) override; | ||
| 94 | void WaitForIdle() override; | 93 | void WaitForIdle() override; |
| 95 | void FragmentBarrier() override; | 94 | void FragmentBarrier() override; |
| 96 | void TiledCacheBarrier() override; | 95 | void TiledCacheBarrier() override; |
diff --git a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.h b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.h index 2906d92a4..4fd15f11a 100644 --- a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.h +++ b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.h | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | // Copyright 2019 yuzu Emulator Project | 1 | // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project |
| 2 | // Licensed under GPLv2 or any later version | 2 | // SPDX-License-Identifier: GPL-3.0-or-later |
| 3 | // Refer to the license.txt file included. | ||
| 4 | 3 | ||
| 5 | #pragma once | 4 | #pragma once |
| 6 | 5 | ||