Merge pull request #1795 from billhollings/fix-buff-binding-justoffset-when-overridden

billhollings · web-flow · commit a307b24001b0 · 2022-12-08T19:08:40.000-05:00
Fix crash when buffer binding updates only offset while it is overridden.
diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
@@ -22,6 +22,7 @@ Released 2022/12/08
 	- `VK_KHR_copy_commands2`
 - Fix crash on descriptor update with out-of-bounds descriptor count data.
 - Fix Metal buffer index binding overrides for push constants and attachment clearing.
+- Fix crash when buffer binding updates only offset while it is overridden.
 - Fix app performance regression triggered by the previous introduction of `VK_KHR_shader_float_controls`.
 - Work around `MTLCounterSet` crash on additional Intel Iris Plus Graphics devices.
 - Fix mistaken YCBCR format support indication.
diff --git a/MoltenVK/MoltenVK/Commands/MVKMTLResourceBindings.h b/MoltenVK/MoltenVK/Commands/MVKMTLResourceBindings.h
@@ -86,7 +86,7 @@ typedef struct MVKMTLBufferBinding {
 			isDirty = true;
         } else if (offset != other.offset) {
             offset = other.offset;
-            justOffset = !isDirty || justOffset;
+            justOffset = !isOverridden && (!isDirty || justOffset);
 			isOverridden = false;
             isDirty = true;
         }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ typedef struct MVKMTLBufferBinding {`
`86`	`86`	`isDirty = true;`
`87`	`87`	`} else if (offset != other.offset) {`
`88`	`88`	`offset = other.offset;`
`89`		`- justOffset = !isDirty \|\| justOffset;`
	`89`	`+ justOffset = !isOverridden && (!isDirty \|\| justOffset);`
`90`	`90`	`isOverridden = false;`
`91`	`91`	`isDirty = true;`
`92`	`92`	`}`