diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-03-27 08:59:58 +0100 |
|---|---|---|
| committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-07-23 03:51:24 +0200 |
| commit | dbd882ddeb1a1a9233c0085d0b8ccb022db385b2 (patch) | |
| tree | 5a8456364cc41a0a53acf93e22e3f9ce855bd413 /src/video_core | |
| parent | spirv: Remove dependencies on Environment when generating SPIR-V (diff) | |
| download | yuzu-dbd882ddeb1a1a9233c0085d0b8ccb022db385b2.tar yuzu-dbd882ddeb1a1a9233c0085d0b8ccb022db385b2.tar.gz yuzu-dbd882ddeb1a1a9233c0085d0b8ccb022db385b2.tar.bz2 yuzu-dbd882ddeb1a1a9233c0085d0b8ccb022db385b2.tar.lz yuzu-dbd882ddeb1a1a9233c0085d0b8ccb022db385b2.tar.xz yuzu-dbd882ddeb1a1a9233c0085d0b8ccb022db385b2.tar.zst yuzu-dbd882ddeb1a1a9233c0085d0b8ccb022db385b2.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 82536b9d6..278509bf0 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -221,10 +221,10 @@ void GraphicsPipeline::MakePipeline(const Device& device, const FixedPipelineSta } } static_vector<VkVertexInputAttributeDescription, 32> vertex_attributes; - const auto& input_attributes = stage_infos[0].loads_generics; + const auto& input_attributes = stage_infos[0].input_generics; for (size_t index = 0; index < state.attributes.size(); ++index) { const auto& attribute = state.attributes[index]; - if (!attribute.enabled || !input_attributes[index]) { + if (!attribute.enabled || !input_attributes[index].used) { continue; } vertex_attributes.push_back({ diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 251559b16..69dd945b2 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -755,6 +755,9 @@ ComputePipeline PipelineCache::CreateComputePipeline(ShaderPools& pools, } static Shader::AttributeType CastAttributeType(const FixedPipelineState::VertexAttribute& attr) { + if (attr.enabled == 0) { + return Shader::AttributeType::Disabled; + } switch (attr.Type()) { case Maxwell::VertexAttribute::Type::SignedNorm: case Maxwell::VertexAttribute::Type::UnsignedNorm: |