diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-21 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-21 01:00:07 +0100 |
| commit | 19510477b49d4c4953b124a3e3765168795cea43 (patch) | |
| tree | bc751e41eee12ad371427daecf39b06bda10c830 /src/3rdparty/angle/src/libANGLE/Context.cpp | |
| parent | e8cb52f035d93ab4c52d7fa88ed30ad324133f65 (diff) | |
| parent | 12978d4ad03af753130ba7c40b6203491cd86cd5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie7f68dcd5650e0037b6c3313cc9ffdcd7c494fbe
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/Context.cpp')
| -rw-r--r-- | src/3rdparty/angle/src/libANGLE/Context.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/Context.cpp b/src/3rdparty/angle/src/libANGLE/Context.cpp index 84f7936feb..f638beda58 100644 --- a/src/3rdparty/angle/src/libANGLE/Context.cpp +++ b/src/3rdparty/angle/src/libANGLE/Context.cpp @@ -451,8 +451,7 @@ egl::Error Context::onDestroy(const egl::Display *display) for (auto &zeroTexture : mZeroTextures) { - auto result = zeroTexture.second->onDestroy(this); - ANGLE_TRY(egl::Error(result)); + ANGLE_TRY(zeroTexture.second->onDestroy(this)); zeroTexture.second.set(this, nullptr); } mZeroTextures.clear(); |