commit 1d93650858d5c8f3c2403dabe6a951732cfe4c5a
author Bill Hollings <bill.hollings@brenwill.com> Fri Sep 18 12:07:26 2020 -0400
committer GitHub <noreply@github.com> Fri Sep 18 12:07:26 2020 -0400
tree 80f371c12504d33d5f9ce3a02ebfc75be84c6853
parent e4b8c67d51fa3448f52ba35464c1f3e58d6c1bf3
parent 69255e812289851d08d806f8a9b26bc8d901f10e

Merge pull request #1042 from cdavis5e/fix-instanced-divisors

MVKGraphicsPipeline: Fix applying divisors to instanced vertex attributes.

MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm b/MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm
index 0f7e1cb..0a0ddc3 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm
@@ -1139,8 +1139,8 @@
         vbCnt = pVertexInputDivisorState->vertexBindingDivisorCount;
         for (uint32_t i = 0; i < vbCnt; i++) {
             const VkVertexInputBindingDivisorDescriptionEXT* pVKVB = &pVertexInputDivisorState->pVertexBindingDivisors[i];
-            uint32_t vbIdx = getMetalBufferIndexForVertexAttributeBinding(pVKVB->binding);
-            if (shaderContext.isVertexBufferUsed(vbIdx)) {
+            if (shaderContext.isVertexBufferUsed(pVKVB->binding)) {
+                uint32_t vbIdx = getMetalBufferIndexForVertexAttributeBinding(pVKVB->binding);
                 if ((NSUInteger)inputDesc.layouts[vbIdx].stepFunction == MTLStepFunctionPerInstance ||
 					(NSUInteger)inputDesc.layouts[vbIdx].stepFunction == MTLStepFunctionThreadPositionInGridY) {
                     if (pVKVB->divisor == 0)