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 (#34200)
* 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
3d82701
commit b1ddee4
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
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 35a819ef635c25a7ff442d75e49ba89cd7ad84a9..4fef5dc883d6de0f48bccd59835188b339ee379a 100644 | ||
--- a/src/libANGLE/State.cpp | ||
+++ b/src/libANGLE/State.cpp | ||
@@ -2190,10 +2190,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)) |