Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: cherry-pick d27d9d059b51 from angle #34045

Merged
merged 3 commits into from May 4, 2022

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented May 3, 2022

[M96-LTS] Vulkan: Update mCurrentElementArrayBuffersync based on dirty bit

M96 merge issues:
ContextVk.cpp:
ContextVk::setupIndexedDraw: vertexArrayVk/getVertexArray() isn't present in M96
ContextVk::syncState: M96 uses mVertexArray instead of vertexArrayVk
VertexArrayVk.cpp:
VertexArrayVk::updateCurrentElementArrayBuffer doesn't exist in M9
Created it and kept M96 logic for retrieving buffer/offset

The previous fix crrev.com/c/3513553 has run into corner case that
requires more follow up change crrev.com/c/3522565. But with that, there
is report that now we are hitting assertion in
handleDirtyGraphicsIndexBuffer(). This becomes a bit fragile This new
fix relies on the DIRTY_BIT_INDEX_BUFFER dirty bit and should be more
reliable as long as the dirty bit is set properly (if not, then we have
other bug that it won't even send down vulkan command to bind the
correct element buffer). We could further optimize the code path and
create a fast path for most common usages in the future.

Bug: chromium:1299261
Change-Id: Ifa8f86d431798c9ca4c128ed71a3e9e0a3537ccb
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3526021
Commit-Queue: Charlie Lao cclao@google.com
(cherry picked from commit 349636a05a3577a127adb6c79a1e947890bbe462)
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3605834
Reviewed-by: Achuith Bhandarkar achuith@chromium.org
Reviewed-by: Charlie Lao cclao@google.com

Notes: Backported fix for CVE-2022-1478.

@ppontes ppontes requested review from a team as code owners May 3, 2022
@ppontes ppontes added 15-x-y backport-check-skip semver/patch labels May 3, 2022
@electron-cation electron-cation bot added new-pr 🌱 and removed new-pr 🌱 labels May 3, 2022
@codebytere codebytere merged commit f8ba4d6 into 15-x-y May 4, 2022
16 checks passed
@codebytere codebytere deleted the cherry-pick/15-x-y/angle/d27d9d059b51 branch May 4, 2022
@release-clerk
Copy link

release-clerk bot commented May 4, 2022

Release Notes Persisted

Backported fix for CVE-2022-1478.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
15-x-y backport-check-skip security 🔒 semver/patch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants