Skip to content

Commit a0c4f8f

Browse files
authored
chore: cherry-pick d49484c21e3c from angle (#34013)
1 parent c7006b5 commit a0c4f8f

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

patches/angle/.patches

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ cherry-pick-2b75a29bf241.patch
99
m96-lts_fix_base_level_changes_not_updating_fbo_completeness_check.patch
1010
m100_fix_crash_when_pausing_xfb_then_deleting_a_buffer.patch
1111
cherry-pick-d27d9d059b51.patch
12+
cherry-pick-d49484c21e3c.patch
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jamie Madill <jmadill@chromium.org>
3+
Date: Mon, 11 Apr 2022 12:29:00 -0400
4+
Subject: Add error check on resuming XFB with deleted buffer.
5+
6+
Bug: chromium:1313905
7+
Change-Id: I22c6f6400b05ca32c922fba9a3b9d4b5841ca8b8
8+
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3578378
9+
Auto-Submit: Jamie Madill <jmadill@chromium.org>
10+
Reviewed-by: Geoff Lang <geofflang@chromium.org>
11+
Commit-Queue: Jamie Madill <jmadill@chromium.org>
12+
(cherry picked from commit 5c85fd4e11a3835a0719223a7cedb978d309da21)
13+
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3594103
14+
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
15+
16+
diff --git a/src/libANGLE/validationES3.cpp b/src/libANGLE/validationES3.cpp
17+
index f9dac542366b51c2431885e1bf4fb85040234ca9..608524ad4df85e6fa81def3c4395e437702af990 100644
18+
--- a/src/libANGLE/validationES3.cpp
19+
+++ b/src/libANGLE/validationES3.cpp
20+
@@ -4309,6 +4309,13 @@ bool ValidateGetActiveUniformBlockName(const Context *context,
21+
return false;
22+
}
23+
24+
+ if (!ValidateProgramExecutableXFBBuffersPresent(context,
25+
+ context->getState().getProgramExecutable()))
26+
+ {
27+
+ context->validationError(GL_INVALID_OPERATION, kTransformFeedbackBufferMissing);
28+
+ return false;
29+
+ }
30+
+
31+
return true;
32+
}
33+

0 commit comments

Comments
 (0)