diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2022-12-14 21:33:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-14 21:33:10 +0100 |
commit | a222f02c7aa88bfbae10075e6a19ce1fbe672815 (patch) | |
tree | 67f7d5d94bfc66d71df7e60826a6c17ed54f9ef1 /src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | |
parent | Merge pull request #9425 from german77/german_unlimited (diff) | |
parent | Fix validation errors on less compatible Intel GPU (diff) | |
download | yuzu-a222f02c7aa88bfbae10075e6a19ce1fbe672815.tar yuzu-a222f02c7aa88bfbae10075e6a19ce1fbe672815.tar.gz yuzu-a222f02c7aa88bfbae10075e6a19ce1fbe672815.tar.bz2 yuzu-a222f02c7aa88bfbae10075e6a19ce1fbe672815.tar.lz yuzu-a222f02c7aa88bfbae10075e6a19ce1fbe672815.tar.xz yuzu-a222f02c7aa88bfbae10075e6a19ce1fbe672815.tar.zst yuzu-a222f02c7aa88bfbae10075e6a19ce1fbe672815.zip |
Diffstat (limited to 'src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp')
-rw-r--r-- | src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 10 |
1 files changed, 8 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 006128638..4b10fe7bc 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -529,7 +529,9 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { static_vector<VkVertexInputBindingDivisorDescriptionEXT, 32> vertex_binding_divisors; static_vector<VkVertexInputAttributeDescription, 32> vertex_attributes; if (key.state.dynamic_vertex_input) { - for (size_t index = 0; index < key.state.attributes.size(); ++index) { + const size_t num_vertex_arrays = std::min( + key.state.attributes.size(), static_cast<size_t>(device.GetMaxVertexInputBindings())); + for (size_t index = 0; index < num_vertex_arrays; ++index) { const u32 type = key.state.DynamicAttributeType(index); if (!stage_infos[0].loads.Generic(index) || type == 0) { continue; @@ -551,7 +553,9 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { }); } } else { - for (size_t index = 0; index < Maxwell::NumVertexArrays; ++index) { + const size_t num_vertex_arrays = std::min( + Maxwell::NumVertexArrays, static_cast<size_t>(device.GetMaxVertexInputBindings())); + for (size_t index = 0; index < num_vertex_arrays; ++index) { const bool instanced = key.state.binding_divisors[index] != 0; const auto rate = instanced ? VK_VERTEX_INPUT_RATE_INSTANCE : VK_VERTEX_INPUT_RATE_VERTEX; @@ -580,6 +584,8 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { }); } } + ASSERT(vertex_attributes.size() <= device.GetMaxVertexInputAttributes()); + VkPipelineVertexInputStateCreateInfo vertex_input_ci{ .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO, .pNext = nullptr, |