summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/libANGLE/Context.cpp
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2019-03-20 14:59:24 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2019-03-20 14:59:24 +0000
commite8cb52f035d93ab4c52d7fa88ed30ad324133f65 (patch)
tree29b1d6743219134c38cb29b8565b8756bb4afa1a /src/3rdparty/angle/src/libANGLE/Context.cpp
parent24358aaf72e94cc0c20cb6a8af8683a9c202a51a (diff)
parent6893919b0c4cddfbd82ebf963cc7bebde816b1b3 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/Context.cpp')
-rw-r--r--src/3rdparty/angle/src/libANGLE/Context.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/Context.cpp b/src/3rdparty/angle/src/libANGLE/Context.cpp
index f638beda58..84f7936feb 100644
--- a/src/3rdparty/angle/src/libANGLE/Context.cpp
+++ b/src/3rdparty/angle/src/libANGLE/Context.cpp
@@ -451,7 +451,8 @@ egl::Error Context::onDestroy(const egl::Display *display)
for (auto &zeroTexture : mZeroTextures)
{
- ANGLE_TRY(zeroTexture.second->onDestroy(this));
+ auto result = zeroTexture.second->onDestroy(this);
+ ANGLE_TRY(egl::Error(result));
zeroTexture.second.set(this, nullptr);
}
mZeroTextures.clear();