diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2019-03-20 10:10:28 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2019-03-20 10:08:14 +0000 |
| commit | f48a76bbbfb5823fb98d17a042bb00ad7c9da174 (patch) | |
| tree | 19a560c088e87b79ef9f631ee4c1c54281c8f186 /src/3rdparty/angle/src/libANGLE/renderer | |
| parent | 2abd969ef6f5841526c48da2e54fe47a001e8d69 (diff) | |
Revert "Fix compilation with icc, converting between egl's and gl's Error types"
The patch causes an Assert on close and thus cannot be used as is. I do
not have ICC available to try to come up with an alternative solution so
the patch is reverted for the time being.
This reverts commit 93a78799c3df7c8859b2d9addad45bb4a535dc97.
Fixes: QTBUG-74467
Change-Id: Ic572dfa667a479686675eb3f9066d133657b4499
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Yuhang Zhao <2546789017@qq.com>
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/renderer')
| -rw-r--r-- | src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp index b583273641..75c6298868 100644 --- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp +++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp @@ -376,8 +376,7 @@ egl::Error Renderer9::initializeDevice() ASSERT(!mBlit); mBlit = new Blit9(this); - auto result = mBlit->initialize(); - ANGLE_TRY(egl::Error(result)); + ANGLE_TRY(mBlit->initialize()); ASSERT(!mVertexDataManager && !mIndexDataManager); mVertexDataManager = new VertexDataManager(this); |