diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-13 08:40:41 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-10-13 11:14:37 +0000 |
| commit | 07800a97277a9be8cf35f8427c6c74e951d7a68d (patch) | |
| tree | a93128d7578fdad30f88e528a3e37912f0b0612a /src/3rdparty/angle | |
| parent | 0872156559dd290e8e940d22a89cb95a46ef0cf6 (diff) | |
| parent | 57fead6100c69128ef6cc483b78ba91e477e8851 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5.1' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/3rdparty/angle')
| -rw-r--r-- | src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp | 15 | ||||
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/entry_points_egl_ext.cpp | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp index 5291a3a086..223e2b019b 100644 --- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp @@ -296,7 +296,20 @@ Renderer11::Renderer11(egl::Display *display) if (requestedMajorVersion == 9 && requestedMinorVersion == 3) #endif { - mAvailableFeatureLevels.push_back(D3D_FEATURE_LEVEL_9_3); + if (requestedMinorVersion == EGL_DONT_CARE || requestedMinorVersion >= 3) + { + mAvailableFeatureLevels.push_back(D3D_FEATURE_LEVEL_9_3); + } +#if defined(ANGLE_ENABLE_WINDOWS_STORE) + if (requestedMinorVersion == EGL_DONT_CARE || requestedMinorVersion >= 2) + { + mAvailableFeatureLevels.push_back(D3D_FEATURE_LEVEL_9_2); + } + if (requestedMinorVersion == EGL_DONT_CARE || requestedMinorVersion >= 1) + { + mAvailableFeatureLevels.push_back(D3D_FEATURE_LEVEL_9_1); + } +#endif } EGLint requestedDeviceType = attributes.get(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, diff --git a/src/3rdparty/angle/src/libGLESv2/entry_points_egl_ext.cpp b/src/3rdparty/angle/src/libGLESv2/entry_points_egl_ext.cpp index 62f3ca1207..02b663192d 100644 --- a/src/3rdparty/angle/src/libGLESv2/entry_points_egl_ext.cpp +++ b/src/3rdparty/angle/src/libGLESv2/entry_points_egl_ext.cpp @@ -49,6 +49,8 @@ EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surfa // validate the attribute parameter switch (attribute) { + case EGL_DEVICE_EXT: + break; case EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE: if (!display->getExtensions().surfaceD3DTexture2DShareHandle) { |