yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #4289 from ReinUsesLisp/dynfix 

vk_rasterizer: Pass <pSizes> to CmdBindVertexBuffers2EXT
This commit is contained in:
bunnei 2020-07-11 23:44:03 -04:00 committed by GitHub
parent f16a94fb39 fca26980a2
commit 5fb27f83cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View File

@ -332,23 +332,23 @@ private:
if constexpr (has_extended_dynamic_state) { if constexpr (has_extended_dynamic_state) {
// With extended dynamic states we can specify the length and stride of a vertex buffer // With extended dynamic states we can specify the length and stride of a vertex buffer
// std::array<VkDeviceSize, N> sizes; std::array<VkDeviceSize, N> sizes;
std::array<u16, N> strides; std::array<u16, N> strides;
// std::copy(vertex.sizes.begin(), vertex.sizes.begin() + N, sizes.begin()); std::copy(vertex.sizes.begin(), vertex.sizes.begin() + N, sizes.begin());
std::copy(vertex.strides.begin(), vertex.strides.begin() + N, strides.begin()); std::copy(vertex.strides.begin(), vertex.strides.begin() + N, strides.begin());
if constexpr (is_indexed) { if constexpr (is_indexed) {
scheduler.Record( scheduler.Record(
[buffers, offsets, strides, index = index](vk::CommandBuffer cmdbuf) { [buffers, offsets, sizes, strides, index = index](vk::CommandBuffer cmdbuf) {
cmdbuf.BindIndexBuffer(index.buffer, index.offset, index.type); cmdbuf.BindIndexBuffer(index.buffer, index.offset, index.type);
cmdbuf.BindVertexBuffers2EXT(0, static_cast<u32>(N), buffers.data(), cmdbuf.BindVertexBuffers2EXT(0, static_cast<u32>(N), buffers.data(),
offsets.data(), nullptr, offsets.data(), sizes.data(),
ExpandStrides(strides).data()); ExpandStrides(strides).data());
}); });
} else { } else {
scheduler.Record([buffers, offsets, strides](vk::CommandBuffer cmdbuf) { scheduler.Record([buffers, offsets, sizes, strides](vk::CommandBuffer cmdbuf) {
cmdbuf.BindVertexBuffers2EXT(0, static_cast<u32>(N), buffers.data(), cmdbuf.BindVertexBuffers2EXT(0, static_cast<u32>(N), buffers.data(),
offsets.data(), nullptr, offsets.data(), sizes.data(),
ExpandStrides(strides).data()); ExpandStrides(strides).data());
}); });
} }