Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cherry-pick a602a068e022 from angle (#34199)
* chore: cherry-pick a602a068e022 from angle * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
- Loading branch information
1 parent
305d26c
commit bcca5c5
Showing
2 changed files
with
32 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
cherry-pick-d27d9d059b51.patch | ||
m100_fix_crash_when_pausing_xfb_then_deleting_a_buffer.patch | ||
cherry-pick-d49484c21e3c.patch | ||
cherry-pick-a602a068e022.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Jamie Madill <jmadill@chromium.org> | ||
Date: Tue, 19 Apr 2022 17:01:20 -0400 | ||
Subject: Fix validate state cache after XFB buffer deleted. | ||
|
||
Bug: chromium:1317650 | ||
Change-Id: Iec9f1167c3b2957091dd0f4ef3efcfcd7c4bf3c0 | ||
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3594250 | ||
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> | ||
Auto-Submit: Jamie Madill <jmadill@chromium.org> | ||
Commit-Queue: Jamie Madill <jmadill@chromium.org> | ||
(cherry picked from commit 4efc4ee6830a8a53a0daf9daa3c7aa835db4220f) | ||
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3621779 | ||
Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com> | ||
|
||
diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp | ||
index ae245e4abdf9818d6aec83e4badad9811ed492b3..e9635038a1d4cc0ab5211b94c22d44f353388d64 100644 | ||
--- a/src/libANGLE/State.cpp | ||
+++ b/src/libANGLE/State.cpp | ||
@@ -2174,10 +2174,7 @@ angle::Result State::detachBuffer(Context *context, const Buffer *buffer) | ||
if (curTransformFeedback) | ||
{ | ||
ANGLE_TRY(curTransformFeedback->detachBuffer(context, bufferID)); | ||
- if (isTransformFeedbackActiveUnpaused()) | ||
- { | ||
- context->getStateCache().onActiveTransformFeedbackChange(context); | ||
- } | ||
+ context->getStateCache().onActiveTransformFeedbackChange(context); | ||
} | ||
|
||
if (getVertexArray()->detachBuffer(context, bufferID)) |