diff options
Diffstat (limited to 'src/3rdparty/angle/src')
| -rw-r--r-- | src/3rdparty/angle/src/libEGL/Surface.cpp | 9 | ||||
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libEGL/Surface.cpp b/src/3rdparty/angle/src/libEGL/Surface.cpp index 5a62142b45..a430a3530f 100644 --- a/src/3rdparty/angle/src/libEGL/Surface.cpp +++ b/src/3rdparty/angle/src/libEGL/Surface.cpp @@ -172,9 +172,16 @@ bool Surface::resetSwapChain() bool Surface::resizeSwapChain(int backbufferWidth, int backbufferHeight) { - ASSERT(backbufferWidth >= 0 && backbufferHeight >= 0); ASSERT(mSwapChain); + // Prevent bad swap chain resize by calling reset if size is invalid + if (backbufferWidth < 1 || backbufferHeight < 1) + { + mWidth = backbufferWidth; + mHeight = backbufferHeight; + return mSwapChain->reset(0, 0, mSwapInterval) == EGL_SUCCESS; + } + EGLint status = mSwapChain->resize(backbufferWidth, backbufferHeight); if (status == EGL_CONTEXT_LOST) diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp index 87422be727..98f887587c 100644 --- a/src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp +++ b/src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp @@ -368,6 +368,9 @@ EGLint SwapChain11::resize(EGLint backbufferWidth, EGLint backbufferHeight) return EGL_BAD_ACCESS; } + if (!mSwapChain) + reset(backbufferWidth, backbufferHeight, mSwapInterval); + // Can only call resize if we have already created our swap buffer and resources ASSERT(mSwapChain && mBackBufferTexture && mBackBufferRTView); |