Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix translation of fully remapped multi vertex attribute bindings

Browse Source 
Fix crash on CTS test:
dEQP-VK.robustness.robustness1_vertex_access.out_of_bounds_stride_30_middle_of_buffer

Bindings with multiple vertex attributes would not correctly detect
if the whole binding was remapped to new location/s. This meant
original binding's stride was never set to 0 which would report an
error and in some cases crash.
This commit is contained in:
Aitor Camacho 2024-01-12 18:59:34 +01:00
parent b5774b38fc
commit a3bb0b802f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MoltenVK/MoltenVK/GPUObjects/MVKPipeline.h
View File

@ -206,6 +206,7 @@ struct MVKTranslatedVertexBinding {
uint16_t binding; uint16_t binding;
uint16_t translationBinding; uint16_t translationBinding;
uint32_t translationOffset; uint32_t translationOffset;
uint32_t mappedAttributeCount;
}; };
/** Describes a vertex buffer binding whose divisor is zero. */ /** Describes a vertex buffer binding whose divisor is zero. */

5
MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm
View File

@ -1491,7 +1491,7 @@ bool MVKGraphicsPipeline::addVertexInputToPipeline(T* inputDesc,
vbXltdDesc.stride = vbDesc.stride; vbXltdDesc.stride = vbDesc.stride;
vbXltdDesc.stepFunction = vbDesc.stepFunction; vbXltdDesc.stepFunction = vbDesc.stepFunction;
vbXltdDesc.stepRate = vbDesc.stepRate; vbXltdDesc.stepRate = vbDesc.stepRate;
xldtVACnt++; xldtVACnt += xltdBind.mappedAttributeCount;
} }
} }
@ -1533,13 +1533,14 @@ uint32_t MVKGraphicsPipeline::getTranslatedVertexBinding(uint32_t binding, uint3
// See if a translated binding already exists (for example if more than one VA needs the same translation). // See if a translated binding already exists (for example if more than one VA needs the same translation).
for (auto& xltdBind : _translatedVertexBindings) { for (auto& xltdBind : _translatedVertexBindings) {
if (xltdBind.binding == binding && xltdBind.translationOffset == translationOffset) { if (xltdBind.binding == binding && xltdBind.translationOffset == translationOffset) {
xltdBind.mappedAttributeCount++;
return xltdBind.translationBinding; return xltdBind.translationBinding;
} }
} }
// Get next available binding point and add a translation binding description for it // Get next available binding point and add a translation binding description for it
uint16_t xltdBindPt = (uint16_t)(maxBinding + _translatedVertexBindings.size() + 1); uint16_t xltdBindPt = (uint16_t)(maxBinding + _translatedVertexBindings.size() + 1);
_translatedVertexBindings.push_back( {.binding = (uint16_t)binding, .translationBinding = xltdBindPt, .translationOffset = translationOffset} ); _translatedVertexBindings.push_back( {.binding = (uint16_t)binding, .translationBinding = xltdBindPt, .translationOffset = translationOffset, .mappedAttributeCount = 1u} );
return xltdBindPt; return xltdBindPt;
} }