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

Fix crash when buffer binding updates only offset while it is overridden.
This commit is contained in:
Bill Hollings 2022-12-08 19:08:40 -05:00 committed by GitHub
commit a307b24001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -22,6 +22,7 @@ Released 2022/12/08
- `VK_KHR_copy_commands2` - `VK_KHR_copy_commands2`
- Fix crash on descriptor update with out-of-bounds descriptor count data. - 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 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`. - 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. - Work around `MTLCounterSet` crash on additional Intel Iris Plus Graphics devices.
- Fix mistaken YCBCR format support indication. - Fix mistaken YCBCR format support indication.

View File

@ -86,7 +86,7 @@ typedef struct MVKMTLBufferBinding {
isDirty = true; isDirty = true;
} else if (offset != other.offset) { } else if (offset != other.offset) {
offset = other.offset; offset = other.offset;
justOffset = !isDirty || justOffset; justOffset = !isOverridden && (!isDirty || justOffset);
isOverridden = false; isOverridden = false;
isDirty = true; isDirty = true;
} }