diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2016-05-19 10:55:46 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2016-05-20 05:27:29 +0000 |
| commit | c276aa51303b7c6f8e4cd854aadf8344a906e50f (patch) | |
| tree | 40cf2cf6cb7b8e22486afaf71b6c5cec7339306f /src/3rdparty/angle/src/libANGLE/validationEGL.cpp | |
| parent | 20211c4213c0b2565ff9ab86b281d069325c1a33 (diff) | |
ANGLE: fixed usage of shared handles for WinRT/WinPhone applications
Both checks are not relevant in Qt's context and were skipped before but
they sneaked back in with the latest ANGLE update.
Change-Id: Ic44de5468a3254afd76ef4804d97d245676daeb1
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/validationEGL.cpp')
| -rw-r--r-- | src/3rdparty/angle/src/libANGLE/validationEGL.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/validationEGL.cpp b/src/3rdparty/angle/src/libANGLE/validationEGL.cpp index 972f6a7a5a..903f51b158 100644 --- a/src/3rdparty/angle/src/libANGLE/validationEGL.cpp +++ b/src/3rdparty/angle/src/libANGLE/validationEGL.cpp @@ -642,11 +642,14 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E return Error(EGL_BAD_ATTRIBUTE); } +// On Windows Store, we know the originating texture came from D3D11, so bypass this check +#if !defined(ANGLE_ENABLE_WINDOWS_STORE) const Caps &caps = display->getCaps(); if (textureFormat != EGL_NO_TEXTURE && !caps.textureNPOT && (!gl::isPow2(width) || !gl::isPow2(height))) { return Error(EGL_BAD_MATCH); } +#endif } return Error(EGL_SUCCESS); |