X11 and Ozone: fix compilation of tests.

src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp

@@ -45,6 +45,10 @@
 #endif
 // clang-format on
 
+#if defined(ANGLE_USE_X11)
+#    include <X11/Xlib.h>
+#endif
+
 namespace tcu
 {
 namespace
@@ -366,7 +370,7 @@ ANGLENativeDisplayFactory::ANGLENativeDisplayFactory(
       mNativeDisplay(bitCast<eglw::EGLNativeDisplayType>(EGL_DEFAULT_DISPLAY)),
       mPlatformAttributes(std::move(platformAttributes))
 {
-#if (DE_OS == DE_OS_UNIX)
+#if (DE_OS == DE_OS_UNIX) && defined(ANGLE_USE_X11)
     // Make sure to only open the X display once so that it can be used by the EGL display as well
     // as pixmaps
     mNativeDisplay = bitCast<eglw::EGLNativeDisplayType>(XOpenDisplay(nullptr));

src/tests/egl_tests/EGLX11VisualTest.cpp

@@ -76,8 +76,9 @@ TEST_P(EGLX11VisualHintTest, InvalidVisualID)
     static const int gInvalidVisualId = -1;
     auto attributes                   = getDisplayAttributes(gInvalidVisualId);
 
-    EGLDisplay display =
-        eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, attributes.data());
+    EGLDisplay display = eglGetPlatformDisplayEXT(
+        EGL_PLATFORM_ANGLE_ANGLE, reinterpret_cast<_XDisplay *>(EGL_DEFAULT_DISPLAY),
+        attributes.data());
     ASSERT_TRUE(display != EGL_NO_DISPLAY);
 
     ASSERT_TRUE(EGL_FALSE == eglInitialize(display, nullptr, nullptr));
@@ -100,9 +101,10 @@ TEST_P(EGLX11VisualHintTest, ValidVisualIDAndClear)
     ASSERT_NE(0, XGetWindowAttributes(mDisplay, xWindow, &windowAttributes));
     int visualId = windowAttributes.visual->visualid;
 
-    auto attributes = getDisplayAttributes(visualId);
-    EGLDisplay display =
-        eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, attributes.data());
+    auto attributes    = getDisplayAttributes(visualId);
+    EGLDisplay display = eglGetPlatformDisplayEXT(
+        EGL_PLATFORM_ANGLE_ANGLE, reinterpret_cast<_XDisplay *>(EGL_DEFAULT_DISPLAY),
+        attributes.data());
     ASSERT_NE(EGL_NO_DISPLAY, display);
 
     ASSERT_TRUE(EGL_TRUE == eglInitialize(display, nullptr, nullptr));
@@ -174,9 +176,10 @@ TEST_P(EGLX11VisualHintTest, InvalidWindowVisualID)
         OSWindow::Delete(&osWindow);
     }
 
-    auto attributes = getDisplayAttributes(visualId);
-    EGLDisplay display =
-        eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, attributes.data());
+    auto attributes    = getDisplayAttributes(visualId);
+    EGLDisplay display = eglGetPlatformDisplayEXT(
+        EGL_PLATFORM_ANGLE_ANGLE, reinterpret_cast<_XDisplay *>(EGL_DEFAULT_DISPLAY),
+        attributes.data());
     ASSERT_NE(EGL_NO_DISPLAY, display);
 
     ASSERT_TRUE(EGL_TRUE == eglInitialize(display, nullptr, nullptr));

util/BUILD.gn

@@ -56,7 +56,12 @@ if (is_fuchsia) {
     "fuchsia/ScenicWindow.cpp",
     "fuchsia/ScenicWindow.h",
   ]
-} else if (use_ozone) {
+} else if (use_ozone && !angle_use_x11) {
+  # Use X11 impl by default otherwise switch to fake Ozone impl that does not
+  # seem to do anything real.
+  # TODO(msisov): probably, we need to have a proper support for different
+  # Ozone backends, and be able to switch between them for proper tests.
+  # For example, Wayland, X11, etc.
   _util_sources += [
     "ozone/OzonePixmap.cpp",
     "ozone/OzoneWindow.cpp",

util/x11/X11Window.cpp

@@ -398,7 +398,7 @@ EGLNativeWindowType X11Window::getNativeWindow() const
 
 EGLNativeDisplayType X11Window::getNativeDisplay() const
 {
-    return mDisplay;
+    return reinterpret_cast<EGLNativeDisplayType>(mDisplay);
 }
 
 void X11Window::messageLoop()