diff options
author | bunnei <bunneidev@gmail.com> | 2020-06-13 05:14:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-13 05:14:48 +0200 |
commit | 563388756951e06a2eeb4fa1e8c806993f34f4a9 (patch) | |
tree | 5034180e818531fedf8618e5520b6e9f24315289 /src/video_core/renderer_vulkan/vk_rasterizer.cpp | |
parent | Merge pull request #4010 from ogniK5377/reserve-always-break (diff) | |
parent | rasterizer_cache: Remove files and includes (diff) | |
download | yuzu-563388756951e06a2eeb4fa1e8c806993f34f4a9.tar yuzu-563388756951e06a2eeb4fa1e8c806993f34f4a9.tar.gz yuzu-563388756951e06a2eeb4fa1e8c806993f34f4a9.tar.bz2 yuzu-563388756951e06a2eeb4fa1e8c806993f34f4a9.tar.lz yuzu-563388756951e06a2eeb4fa1e8c806993f34f4a9.tar.xz yuzu-563388756951e06a2eeb4fa1e8c806993f34f4a9.tar.zst yuzu-563388756951e06a2eeb4fa1e8c806993f34f4a9.zip |
Diffstat (limited to 'src/video_core/renderer_vulkan/vk_rasterizer.cpp')
-rw-r--r-- | src/video_core/renderer_vulkan/vk_rasterizer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 19b8f9da3..3170c41f8 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -38,6 +38,7 @@ #include "video_core/renderer_vulkan/vk_texture_cache.h" #include "video_core/renderer_vulkan/vk_update_descriptor.h" #include "video_core/renderer_vulkan/wrapper.h" +#include "video_core/shader_cache.h" namespace Vulkan { @@ -98,7 +99,7 @@ VkRect2D GetScissorState(const Maxwell& regs, std::size_t index) { } std::array<GPUVAddr, Maxwell::MaxShaderProgram> GetShaderAddresses( - const std::array<Shader, Maxwell::MaxShaderProgram>& shaders) { + const std::array<Shader*, Maxwell::MaxShaderProgram>& shaders) { std::array<GPUVAddr, Maxwell::MaxShaderProgram> addresses; for (std::size_t i = 0; i < std::size(addresses); ++i) { addresses[i] = shaders[i] ? shaders[i]->GetGpuAddr() : 0; @@ -776,12 +777,12 @@ RasterizerVulkan::DrawParameters RasterizerVulkan::SetupGeometry(FixedPipelineSt } void RasterizerVulkan::SetupShaderDescriptors( - const std::array<Shader, Maxwell::MaxShaderProgram>& shaders) { + const std::array<Shader*, Maxwell::MaxShaderProgram>& shaders) { texture_cache.GuardSamplers(true); for (std::size_t stage = 0; stage < Maxwell::MaxShaderStage; ++stage) { // Skip VertexA stage - const auto& shader = shaders[stage + 1]; + Shader* const shader = shaders[stage + 1]; if (!shader) { continue; } |