EGL: Expose device query as a client extension.

src/libANGLE/Caps.cpp

@@ -1375,7 +1375,6 @@ std::vector<std::string> DisplayExtensions::getStrings() const
     InsertExtensionString("EGL_ANGLE_windows_ui_composition",                    windowsUIComposition,               &extensionStrings);
     InsertExtensionString("EGL_NV_post_sub_buffer",                              postSubBuffer,                      &extensionStrings);
     InsertExtensionString("EGL_KHR_create_context",                              createContext,                      &extensionStrings);
-    InsertExtensionString("EGL_EXT_device_query",                                deviceQuery,                        &extensionStrings);
     InsertExtensionString("EGL_KHR_image",                                       image,                              &extensionStrings);
     InsertExtensionString("EGL_KHR_image_base",                                  imageBase,                          &extensionStrings);
     InsertExtensionString("EGL_KHR_image_pixmap",                                imagePixmap,                        &extensionStrings);
@@ -1464,6 +1463,7 @@ std::vector<std::string> ClientExtensions::getStrings() const
     // clang-format off
     //                   | Extension name                                    | Supported flag                   | Output vector   |
     InsertExtensionString("EGL_EXT_client_extensions",                        clientExtensions,                   &extensionStrings);
+    InsertExtensionString("EGL_EXT_device_query",                             deviceQueryEXT,                        &extensionStrings);
     InsertExtensionString("EGL_EXT_platform_base",                            platformBase,                       &extensionStrings);
     InsertExtensionString("EGL_EXT_platform_device",                          platformDevice,                     &extensionStrings);
     InsertExtensionString("EGL_ANGLE_platform_angle",                         platformANGLE,                      &extensionStrings);

src/libANGLE/Caps.h

@@ -989,9 +989,6 @@ struct DisplayExtensions
     // EGL_KHR_create_context
     bool createContext = false;
 
-    // EGL_EXT_device_query
-    bool deviceQuery = false;
-
     // EGL_KHR_image
     bool image = false;
 
@@ -1266,6 +1263,9 @@ struct ClientExtensions
 
     // EGL_ANGLE_platform_angle_device_type_egl_angle
     bool platformANGLEDeviceTypeEGLANGLE = false;
+
+    // EGL_EXT_device_query
+    bool deviceQueryEXT = false;
 };
 
 }  // namespace egl

src/libANGLE/Display.cpp

@@ -864,32 +864,29 @@ Error Display::initialize()
     initVendorString();
 
     // Populate the Display's EGLDeviceEXT if the Display wasn't created using one
-    if (mPlatform != EGL_PLATFORM_DEVICE_EXT)
+    if (mPlatform == EGL_PLATFORM_DEVICE_EXT)
     {
-        if (mDisplayExtensions.deviceQuery)
-        {
-            std::unique_ptr<rx::DeviceImpl> impl(mImplementation->createDevice());
-            ASSERT(impl != nullptr);
-            error = impl->initialize();
-            if (error.isError())
-            {
-                ERR() << "Failed to initialize display because device creation failed: "
-                      << error.getMessage();
-                mImplementation->terminate();
-                return error;
-            }
-            mDevice = new Device(this, impl.release());
-        }
-        else
+        // For EGL_PLATFORM_DEVICE_EXT, mDevice should always be populated using
+        // an external device
+        ASSERT(mDevice != nullptr);
+    }
+    else if (GetClientExtensions().deviceQueryEXT)
+    {
+        std::unique_ptr<rx::DeviceImpl> impl(mImplementation->createDevice());
+        ASSERT(impl);
+        error = impl->initialize();
+        if (error.isError())
         {
-            mDevice = nullptr;
+            ERR() << "Failed to initialize display because device creation failed: "
+                  << error.getMessage();
+            mImplementation->terminate();
+            return error;
         }
+        mDevice = new Device(this, impl.release());
     }
     else
     {
-        // For EGL_PLATFORM_DEVICE_EXT, mDevice should always be populated using
-        // an external device
-        ASSERT(mDevice != nullptr);
+        mDevice = nullptr;
     }
 
     mInitialized = true;
@@ -1666,6 +1663,7 @@ static ClientExtensions GenerateClientExtensions()
     extensions.debug                     = true;
     extensions.explicitContext           = true;
     extensions.featureControlANGLE       = true;
+    extensions.deviceQueryEXT            = true;
 
     return extensions;
 }

src/libANGLE/renderer/DisplayImpl.cpp

@@ -10,9 +10,34 @@
 
 #include "libANGLE/Display.h"
 #include "libANGLE/Surface.h"
+#include "libANGLE/renderer/DeviceImpl.h"
 
 namespace rx
 {
+namespace
+{
+// For back-ends that do not implement EGLDevice.
+class MockDevice : public DeviceImpl
+{
+  public:
+    MockDevice() = default;
+    egl::Error initialize() override { return egl::NoError(); }
+    egl::Error getAttribute(const egl::Display *display, EGLint attribute, void **outValue) override
+    {
+        UNREACHABLE();
+        return egl::EglBadAttribute();
+    }
+    EGLint getType() override
+    {
+        UNREACHABLE();
+        return EGL_NONE;
+    }
+    void generateExtensions(egl::DeviceExtensions *outExtensions) const override
+    {
+        *outExtensions = egl::DeviceExtensions();
+    }
+};
+}  // anonymous namespace
 
 DisplayImpl::DisplayImpl(const egl::DisplayState &state)
     : mState(state), mExtensionsInitialized(false), mCapsInitialized(false), mBlobCache(nullptr)
@@ -86,4 +111,8 @@ const egl::Caps &DisplayImpl::getCaps() const
     return mCaps;
 }
 
+DeviceImpl *DisplayImpl::createDevice()
+{
+    return new MockDevice();
+}
 }  // namespace rx

src/libANGLE/renderer/DisplayImpl.h

@@ -96,7 +96,7 @@ class DisplayImpl : public EGLImplFactory, public angle::Subject
 
     virtual std::string getVendorString() const = 0;
 
-    virtual DeviceImpl *createDevice() = 0;
+    virtual DeviceImpl *createDevice();
 
     virtual egl::Error waitClient(const gl::Context *context)                = 0;
     virtual egl::Error waitNative(const gl::Context *context, EGLint engine) = 0;

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

@@ -1287,8 +1287,6 @@ void Renderer11::generateDisplayExtensions(egl::DisplayExtensions *outExtensions
     // D3D11 does not support present with dirty rectangles until DXGI 1.2.
     outExtensions->postSubBuffer = mRenderer11DeviceCaps.supportsDXGI1_2;
 
-    outExtensions->deviceQuery = true;
-
     outExtensions->image                 = true;
     outExtensions->imageBase             = true;
     outExtensions->glTexture2DImage      = true;

src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp

@@ -588,7 +588,6 @@ void Renderer9::generateDisplayExtensions(egl::DisplayExtensions *outExtensions)
     outExtensions->querySurfacePointer = true;
     outExtensions->windowFixedSize     = true;
     outExtensions->postSubBuffer       = true;
-    outExtensions->deviceQuery         = true;
 
     outExtensions->image               = true;
     outExtensions->imageBase           = true;

src/libANGLE/renderer/gl/cgl/DisplayCGL.mm

@@ -479,7 +479,6 @@ void DisplayCGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
 {
     outExtensions->iosurfaceClientBuffer = true;
     outExtensions->surfacelessContext    = true;
-    outExtensions->deviceQuery           = true;
 
     // Contexts are virtualized so textures and semaphores can be shared globally
     outExtensions->displayTextureShareGroup   = true;

src/libANGLE/renderer/gl/egl/DisplayEGL.cpp

@@ -566,12 +566,6 @@ bool DisplayEGL::isValidNativeWindow(EGLNativeWindowType window) const
     return true;
 }
 
-DeviceImpl *DisplayEGL::createDevice()
-{
-    UNIMPLEMENTED();
-    return nullptr;
-}
-
 egl::Error DisplayEGL::waitClient(const gl::Context *context)
 {
     UNIMPLEMENTED();

src/libANGLE/renderer/gl/egl/DisplayEGL.h

@@ -76,8 +76,6 @@ class DisplayEGL : public DisplayGL
 
     bool isValidNativeWindow(EGLNativeWindowType window) const override;
 
-    DeviceImpl *createDevice() override;
-
     egl::Error waitClient(const gl::Context *context) override;
     egl::Error waitNative(const gl::Context *context, EGLint engine) override;
 

src/libANGLE/renderer/gl/glx/DisplayGLX.cpp

@@ -495,12 +495,6 @@ ContextImpl *DisplayGLX::createContext(const gl::State &state,
     return new ContextGL(state, errorSet, mRenderer, robustnessVideoMemoryPurgeStatus);
 }
 
-DeviceImpl *DisplayGLX::createDevice()
-{
-    UNIMPLEMENTED();
-    return nullptr;
-}
-
 egl::Error DisplayGLX::initializeContext(glx::FBConfig config,
                                          const egl::AttributeMap &eglAttributes,
                                          glx::Context *context)

src/libANGLE/renderer/gl/glx/DisplayGLX.h

@@ -70,8 +70,6 @@ class DisplayGLX : public DisplayGL
 
     bool isValidNativeWindow(EGLNativeWindowType window) const override;
 
-    DeviceImpl *createDevice() override;
-
     std::string getVendorString() const override;
 
     egl::Error waitClient(const gl::Context *context) override;

src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp

@@ -472,12 +472,6 @@ rx::ContextImpl *DisplayWGL::createContext(const gl::State &state,
     return new ContextWGL(state, errorSet, mRenderer);
 }
 
-DeviceImpl *DisplayWGL::createDevice()
-{
-    UNREACHABLE();
-    return nullptr;
-}
-
 egl::ConfigSet DisplayWGL::generateConfigs()
 {
     egl::ConfigSet configs;

src/libANGLE/renderer/gl/wgl/DisplayWGL.h

@@ -63,8 +63,6 @@ class DisplayWGL : public DisplayGL
                                     EGLClientBuffer clientBuffer,
                                     const egl::AttributeMap &attribs) const override;
 
-    DeviceImpl *createDevice() override;
-
     std::string getVendorString() const override;
 
     egl::Error waitClient(const gl::Context *context) override;

src/libANGLE/renderer/metal/DisplayMtl.h

@@ -48,8 +48,6 @@ class DisplayMtl : public DisplayImpl
 
     std::string getVendorString() const override;
 
-    DeviceImpl *createDevice() override;
-
     egl::Error waitClient(const gl::Context *context) override;
     egl::Error waitNative(const gl::Context *context, EGLint engine) override;
 

src/libANGLE/renderer/metal/DisplayMtl.mm

@@ -24,7 +24,6 @@
 
 namespace rx
 {
-
 bool IsMetalDisplayAvailable()
 {
     // We only support macos 10.13+ and 11 for now. Since they are requirements for Metal 2.0.
@@ -153,12 +152,6 @@ std::string DisplayMtl::getVendorString() const
     }
 }
 
-DeviceImpl *DisplayMtl::createDevice()
-{
-    UNIMPLEMENTED();
-    return nullptr;
-}
-
 egl::Error DisplayMtl::waitClient(const gl::Context *context)
 {
     auto contextMtl      = GetImplAs<ContextMtl>(context);

src/libANGLE/renderer/null/DisplayNULL.cpp

@@ -200,7 +200,6 @@ void DisplayNULL::generateExtensions(egl::DisplayExtensions *outExtensions) cons
     outExtensions->createContextRobustness            = true;
     outExtensions->postSubBuffer                      = true;
     outExtensions->createContext                      = true;
-    outExtensions->deviceQuery                        = true;
     outExtensions->image                              = true;
     outExtensions->imageBase                          = true;
     outExtensions->glTexture2DImage                   = true;

src/libANGLE/renderer/vulkan/DisplayVk.cpp

@@ -85,12 +85,6 @@ std::string DisplayVk::getVendorString() const
     return vendorString;
 }
 
-DeviceImpl *DisplayVk::createDevice()
-{
-    UNIMPLEMENTED();
-    return nullptr;
-}
-
 egl::Error DisplayVk::waitClient(const gl::Context *context)
 {
     ANGLE_TRACE_EVENT0("gpu.angle", "DisplayVk::waitClient");

src/libANGLE/renderer/vulkan/DisplayVk.h

@@ -64,8 +64,6 @@ class DisplayVk : public DisplayImpl, public vk::Context
 
     std::string getVendorString() const override;
 
-    DeviceImpl *createDevice() override;
-
     egl::Error waitClient(const gl::Context *context) override;
     egl::Error waitNative(const gl::Context *context, EGLint engine) override;
 

src/libANGLE/validationEGL.cpp

@@ -4545,7 +4545,7 @@ Error ValidateQueryDisplayAttribBase(const Display *display, const EGLint attrib
     switch (attribute)
     {
         case EGL_DEVICE_EXT:
-            if (!display->getExtensions().deviceQuery)
+            if (!Display::GetClientExtensions().deviceQueryEXT)
             {
                 return EglBadDisplay() << "EGL_EXT_device_query extension is not available.";
             }

src/libGLESv2/entry_points_egl_ext.cpp

@@ -279,20 +279,10 @@ EGLBoolean EGLAPIENTRY EGL_QueryDeviceAttribEXT(EGLDeviceEXT device,
         thread->setError(error, GetDebug(), "eglQueryDeviceAttribEXT", GetDeviceIfValid(dev));
         return EGL_FALSE;
     }
-    egl::Display *owningDisplay = dev->getOwningDisplay();
-    if (owningDisplay)
-    {
-        ANGLE_EGL_TRY_RETURN(thread, owningDisplay->prepareForCall(), "eglQueryDeviceAttribEXT",
-                             GetDisplayIfValid(owningDisplay), EGL_FALSE);
-    }
-    // If the device was created by (and is owned by) a display, and that display doesn't support
-    // device querying, then this call should fail
-    if (owningDisplay != nullptr && !owningDisplay->getExtensions().deviceQuery)
+    if (!Display::GetClientExtensions().deviceQueryEXT)
     {
-        thread->setError(EglBadAccess() << "Device wasn't created using eglCreateDeviceANGLE, "
-                                           "and the egl::Display that created it doesn't support "
-                                           "device querying",
-                         GetDebug(), "eglQueryDeviceAttribEXT", GetDeviceIfValid(dev));
+        thread->setError(EglBadAccess() << "EGL_EXT_device_query not supported.", GetDebug(),
+                         "eglQueryDeviceAttribEXT", GetDeviceIfValid(dev));
         return EGL_FALSE;
     }
 

src/tests/egl_tests/EGLPresentPathD3D11Test.cpp

@@ -88,9 +88,7 @@ class EGLPresentPathD3D11 : public ANGLETest
         EGLAttrib device      = 0;
         EGLAttrib angleDevice = 0;
 
-        const char *extensionString =
-            static_cast<const char *>(eglQueryString(mDisplay, EGL_EXTENSIONS));
-        EXPECT_TRUE(strstr(extensionString, "EGL_EXT_device_query"));
+        EXPECT_TRUE(IsEGLClientExtensionEnabled("EGL_EXT_device_query"));
 
         ASSERT_EGL_TRUE(eglQueryDisplayAttribEXT(mDisplay, EGL_DEVICE_EXT, &angleDevice));
         ASSERT_EGL_TRUE(eglQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),

src/tests/gl_tests/D3DTextureTest.cpp

@@ -80,37 +80,30 @@ class D3DTextureTest : public ANGLETest
         PFN_D3D11_CREATE_DEVICE createDeviceFunc = reinterpret_cast<PFN_D3D11_CREATE_DEVICE>(
             GetProcAddress(mD3D11Module, "D3D11CreateDevice"));
 
-        EGLWindow *window  = getEGLWindow();
-        EGLDisplay display = window->getDisplay();
-        if (IsEGLDisplayExtensionEnabled(display, "EGL_EXT_device_query"))
+        EGLWindow *window   = getEGLWindow();
+        EGLDisplay display  = window->getDisplay();
+        EGLDeviceEXT device = EGL_NO_DEVICE_EXT;
+        if (IsEGLClientExtensionEnabled("EGL_EXT_device_query"))
         {
-            PFNEGLQUERYDISPLAYATTRIBEXTPROC eglQueryDisplayAttribEXT =
-                reinterpret_cast<PFNEGLQUERYDISPLAYATTRIBEXTPROC>(
-                    eglGetProcAddress("eglQueryDisplayAttribEXT"));
-            PFNEGLQUERYDEVICEATTRIBEXTPROC eglQueryDeviceAttribEXT =
-                reinterpret_cast<PFNEGLQUERYDEVICEATTRIBEXTPROC>(
-                    eglGetProcAddress("eglQueryDeviceAttribEXT"));
-
-            EGLDeviceEXT device = 0;
+            EGLAttrib result = 0;
+            EXPECT_EGL_TRUE(eglQueryDisplayAttribEXT(display, EGL_DEVICE_EXT, &result));
+            device = reinterpret_cast<EGLDeviceEXT>(result);
+        }
+
+        ASSERT_NE(EGL_NO_DEVICE_EXT, device);
+
+        if (IsEGLDeviceExtensionEnabled(device, "EGL_ANGLE_device_d3d"))
+        {
+            EGLAttrib result = 0;
+            if (eglQueryDeviceAttribEXT(device, EGL_D3D11_DEVICE_ANGLE, &result))
             {
-                EGLAttrib result = 0;
-                EXPECT_EGL_TRUE(eglQueryDisplayAttribEXT(display, EGL_DEVICE_EXT, &result));
-                device = reinterpret_cast<EGLDeviceEXT>(result);
+                mD3D11Device = reinterpret_cast<ID3D11Device *>(result);
+                mD3D11Device->AddRef();
             }
-
-            if (IsEGLDeviceExtensionEnabled(device, "EGL_ANGLE_device_d3d"))
+            else if (eglQueryDeviceAttribEXT(device, EGL_D3D9_DEVICE_ANGLE, &result))
             {
-                EGLAttrib result = 0;
-                if (eglQueryDeviceAttribEXT(device, EGL_D3D11_DEVICE_ANGLE, &result))
-                {
-                    mD3D11Device = reinterpret_cast<ID3D11Device *>(result);
-                    mD3D11Device->AddRef();
-                }
-                else if (eglQueryDeviceAttribEXT(device, EGL_D3D9_DEVICE_ANGLE, &result))
-                {
-                    mD3D9Device = reinterpret_cast<IDirect3DDevice9 *>(result);
-                    mD3D9Device->AddRef();
-                }
+                mD3D9Device = reinterpret_cast<IDirect3DDevice9 *>(result);
+                mD3D9Device->AddRef();
             }
         }
         else