eglGetPlatformDisplayEXT: validate device types are set only on d3d

BUG=angleproject:892 Change-Id: I0fa089f299abaab406384a05b096de19f04f3a5e Reviewed-on: https://chromium-review.googlesource.com/269771Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/269829

eglGetPlatformDisplayEXT: validate device types are set only on d3d
6db6e0ae · Corentin Wallez · 06394f66 · 6db6e0ae
Commit 6db6e0ae authored May 06, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

entry_points_egl_ext.cpp src/libGLESv2/entry_points_egl_ext.cpp +11 -6

No files found.
--- a/src/libGLESv2/entry_points_egl_ext.cpp
+++ b/src/libGLESv2/entry_points_egl_ext.cpp
@@ -148,6 +148,7 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_disp
    bool majorVersionSpecified = false;
    bool minorVersionSpecified = false;
    bool enableAutoTrimSpecified = false;
+    bool deviceTypeSpecified = false;

    if (attrib_list)
    {
@@ -214,12 +215,6 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_disp
                break;

              case EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE:
-                if (!clientExtensions.platformANGLED3D)
-                {
-                    SetGlobalError(Error(EGL_BAD_ATTRIBUTE));
-                    return EGL_NO_DISPLAY;
-                }
-
                switch (curAttrib[1])
                {
                  case EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE:
@@ -233,6 +228,7 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_disp
                    return EGL_NO_DISPLAY;
                }
                deviceType = curAttrib[1];
+                deviceTypeSpecified = true;
                break;

              default:
@@ -263,6 +259,15 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_disp
        return EGL_NO_DISPLAY;
    }

+    if (deviceTypeSpecified &&
+        platformType != EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE &&
+        platformType != EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+    {
+        SetGlobalError(Error(EGL_BAD_ATTRIBUTE, "EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE requires a device type of "
+                                                "EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE or EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE."));
+        return EGL_NO_DISPLAY;
+    }
+
    SetGlobalError(Error(EGL_SUCCESS));

    EGLNativeDisplayType displayId = static_cast<EGLNativeDisplayType>(native_display);