Vulkan: Implement eglWaitNative function

src/libANGLE/Display.cpp

@@ -392,7 +392,9 @@ static constexpr uint32_t kScratchBufferLifetime = 64u;
 
 }  // anonymous namespace
 
-DisplayState::DisplayState() : label(nullptr), featuresAllDisabled(false) {}
+DisplayState::DisplayState(EGLNativeDisplayType nativeDisplayId)
+    : label(nullptr), featuresAllDisabled(false), displayId(nativeDisplayId)
+{}
 
 DisplayState::~DisplayState() {}
 
@@ -506,8 +508,8 @@ Display *Display::GetDisplayFromDevice(Device *device, const AttributeMap &attri
 }
 
 Display::Display(EGLenum platform, EGLNativeDisplayType displayId, Device *eglDevice)
-    : mImplementation(nullptr),
-      mDisplayId(displayId),
+    : mState(displayId),
+      mImplementation(nullptr),
       mAttributeMap(),
       mConfigSet(),
       mContextSet(),
@@ -535,7 +537,7 @@ Display::~Display()
     if (mPlatform == EGL_PLATFORM_ANGLE_ANGLE)
     {
         ANGLEPlatformDisplayMap *displays      = GetANGLEPlatformDisplayMap();
-        ANGLEPlatformDisplayMap::iterator iter = displays->find(mDisplayId);
+        ANGLEPlatformDisplayMap::iterator iter = displays->find(mState.displayId);
         if (iter != displays->end())
         {
             displays->erase(iter);

src/libANGLE/Display.h

@@ -51,7 +51,7 @@ using SurfaceSet = std::set<Surface *>;
 
 struct DisplayState final : private angle::NonCopyable
 {
-    DisplayState();
+    DisplayState(EGLNativeDisplayType nativeDisplayId);
     ~DisplayState();
 
     EGLLabelKHR label;
@@ -59,6 +59,7 @@ struct DisplayState final : private angle::NonCopyable
     std::vector<std::string> featureOverridesEnabled;
     std::vector<std::string> featureOverridesDisabled;
     bool featuresAllDisabled;
+    EGLNativeDisplayType displayId;
 };
 
 // Constant coded here as a sanity limit.
@@ -187,7 +188,7 @@ class Display final : public LabeledObject, angle::NonCopyable
     EGLint programCacheResize(EGLint limit, EGLenum mode);
 
     const AttributeMap &getAttributeMap() const { return mAttributeMap; }
-    EGLNativeDisplayType getNativeDisplayId() const { return mDisplayId; }
+    EGLNativeDisplayType getNativeDisplayId() const { return mState.displayId; }
 
     rx::DisplayImpl *getImplementation() const { return mImplementation; }
     Device *getDevice() const;
@@ -237,7 +238,6 @@ class Display final : public LabeledObject, angle::NonCopyable
     DisplayState mState;
     rx::DisplayImpl *mImplementation;
 
-    EGLNativeDisplayType mDisplayId;
     AttributeMap mAttributeMap;
 
     ConfigSet mConfigSet;

src/libANGLE/renderer/vulkan/DisplayVk.cpp

@@ -92,8 +92,13 @@ egl::Error DisplayVk::waitClient(const gl::Context *context)
 
 egl::Error DisplayVk::waitNative(const gl::Context *context, EGLint engine)
 {
-    UNIMPLEMENTED();
-    return egl::EglBadAccess();
+    ANGLE_TRACE_EVENT0("gpu.angle", "DisplayVk::waitNative");
+    return angle::ResultToEGL(waitNativeImpl());
+}
+
+angle::Result DisplayVk::waitNativeImpl()
+{
+    return angle::Result::Continue;
 }
 
 SurfaceImpl *DisplayVk::createWindowSurface(const egl::SurfaceState &state,

src/libANGLE/renderer/vulkan/DisplayVk.h

@@ -103,6 +103,8 @@ class DisplayVk : public DisplayImpl, public vk::Context
                                                EGLNativeWindowType window) = 0;
     void generateCaps(egl::Caps *outCaps) const override;
 
+    virtual angle::Result waitNativeImpl();
+
     mutable angle::ScratchBuffer mScratchBuffer;
 
     std::string mStoredErrorString;

src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp

@@ -11,6 +11,7 @@
 
 #include <xcb/xcb.h>
 
+#include "libANGLE/Display.h"
 #include "libANGLE/renderer/vulkan/vk_caps_utils.h"
 #include "libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h"
 
@@ -121,4 +122,10 @@ DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state)
 {
     return new DisplayVkXcb(state);
 }
+
+angle::Result DisplayVkXcb::waitNativeImpl()
+{
+    XSync(mState.displayId, False);
+    return angle::Result::Continue;
+}
 }  // namespace rx

src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h

@@ -34,6 +34,7 @@ class DisplayVkXcb : public DisplayVk
     bool checkConfigSupport(egl::Config *config) override;
 
     const char *getWSIExtension() const override;
+    angle::Result waitNativeImpl() override;
 
   private:
     xcb_connection_t *mXcbConnection;

src/tests/egl_tests/EGLSyncTest.cpp

@@ -233,6 +233,17 @@ TEST_P(EGLSyncTest, BasicOperations)
     EXPECT_EGL_TRUE(eglDestroySyncKHR(display, sync));
 }
 
+// Test eglWaitNative api
+TEST_P(EGLSyncTest, WaitNative)
+{
+    // Clear to red color
+    glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
+
+    glClear(GL_COLOR_BUFFER_BIT);
+    EXPECT_EGL_TRUE(eglWaitNative(EGL_CORE_NATIVE_ENGINE));
+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
+}
+
 ANGLE_INSTANTIATE_TEST(EGLSyncTest,
                        ES2_D3D9(),
                        ES2_D3D11(),