diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2019-02-13 23:26:55 +0800 |
|---|---|---|
| committer | Yuhang Zhao <2546789017@qq.com> | 2019-02-18 13:04:50 +0000 |
| commit | 93a78799c3df7c8859b2d9addad45bb4a535dc97 (patch) | |
| tree | c7c4aac196dead68dcf6205fd661b750c96c88d5 /src/3rdparty/angle/src/libANGLE/Texture.cpp | |
| parent | 1366c4f04645d74e83847687adcf61ecfa20b3d2 (diff) | |
Fix compilation with icc, converting between egl's and gl's Error types
Each has two constructors from the other, one copying the other
moving; and this leads to an ambiguous overload when converting
Texture::onDestroy()'s gl::error to the egl::Error that
gl::Context::onDestroy() returns. Passing the value through a
temporary prevents the move-constructor from being attempted and saves
the day. Thanks to Ville Voutilainen for suggesting the fix.
Fixes: QTBUG-73698
Change-Id: I628173399a73cee2e253201bc3e8d3e6477a2fbf
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/Texture.cpp')
| -rw-r--r-- | src/3rdparty/angle/src/libANGLE/Texture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/Texture.cpp b/src/3rdparty/angle/src/libANGLE/Texture.cpp index da92e65916..7447604fe6 100644 --- a/src/3rdparty/angle/src/libANGLE/Texture.cpp +++ b/src/3rdparty/angle/src/libANGLE/Texture.cpp @@ -550,7 +550,8 @@ Error Texture::onDestroy(const Context *context) { if (mBoundSurface) { - ANGLE_TRY(mBoundSurface->releaseTexImage(context, EGL_BACK_BUFFER)); + auto result = mBoundSurface->releaseTexImage(context, EGL_BACK_BUFFER); + ANGLE_TRY(Error(result)); mBoundSurface = nullptr; } if (mBoundStream) |