Vulkan: Implement eglWaitClient using a finish.
In the future this can be implemented with a flush.
BUG=angleproject:2707
Change-Id: I1dd4eae9551f7797865e6e17e6caa77f6ec5a9b2
Reviewed-on: https://chromium-review.googlesource.com/1126457
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Luc Ferron <lucferron@chromium.org>
diff --git a/src/libANGLE/renderer/vulkan/DisplayVk.cpp b/src/libANGLE/renderer/vulkan/DisplayVk.cpp
index 429ffe5..0dbd18e 100644
--- a/src/libANGLE/renderer/vulkan/DisplayVk.cpp
+++ b/src/libANGLE/renderer/vulkan/DisplayVk.cpp
@@ -78,8 +78,11 @@
egl::Error DisplayVk::waitClient(const gl::Context *context) const
{
+ // TODO(jmadill): Call flush instead of finish once it is implemented in RendererVK.
+ // http://anglebug.com/2504
UNIMPLEMENTED();
- return egl::EglBadAccess();
+
+ return mRenderer->finish(context);
}
egl::Error DisplayVk::waitNative(const gl::Context *context, EGLint engine) const
diff --git a/src/tests/deqp_support/deqp_egl_test_expectations.txt b/src/tests/deqp_support/deqp_egl_test_expectations.txt
index e9bde9a..0210d0d 100644
--- a/src/tests/deqp_support/deqp_egl_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_egl_test_expectations.txt
@@ -167,10 +167,6 @@
2635 WIN VULKAN : dEQP-EGL.functional.multicontext.non_shared_make_current = FAIL
2635 WIN VULKAN : dEQP-EGL.functional.multicontext.shared_clear = FAIL
2635 WIN VULKAN : dEQP-EGL.functional.multicontext.shared_make_current = FAIL
-2635 WIN VULKAN : dEQP-EGL.functional.query_context.get_current_context.rgba8888_pbuffer = FAIL
-2635 WIN VULKAN : dEQP-EGL.functional.query_context.get_current_display.rgba8888_pbuffer = FAIL
-2635 WIN VULKAN : dEQP-EGL.functional.query_context.get_current_surface.rgba8888_pbuffer = FAIL
-2635 WIN VULKAN : dEQP-EGL.functional.query_context.query_context.rgba8888_pbuffer = FAIL
2635 WIN VULKAN : dEQP-EGL.functional.query_surface.set_attribute.pbuffer.rgba8888_depth_stencil = FAIL
2635 WIN VULKAN : dEQP-EGL.functional.query_surface.set_attribute.pbuffer.rgba8888_no_depth_no_stencil = FAIL
2635 WIN VULKAN : dEQP-EGL.functional.query_surface.simple.pbuffer.rgba8888_no_depth_no_stencil = FAIL
@@ -215,10 +211,6 @@
2546 LINUX : dEQP-EGL.functional.query_surface.simple.pbuffer.rgba8888_no_depth_no_stencil = FAIL
// Linux Vulkan failures
-2635 LINUX VULKAN : dEQP-EGL.functional.query_context.get_current_context.rgba8888_pbuffer = FAIL
-2635 LINUX VULKAN : dEQP-EGL.functional.query_context.get_current_display.rgba8888_pbuffer = FAIL
-2635 LINUX VULKAN : dEQP-EGL.functional.query_context.get_current_surface.rgba8888_pbuffer = FAIL
-2635 LINUX VULKAN : dEQP-EGL.functional.query_context.query_context.rgba8888_pbuffer = FAIL
2635 LINUX VULKAN : dEQP-EGL.functional.query_surface.set_attribute.pbuffer.rgba8888_depth_stencil = FAIL
2635 LINUX VULKAN : dEQP-EGL.functional.query_surface.set_attribute.pbuffer.rgba8888_no_depth_no_stencil = FAIL
2635 LINUX VULKAN : dEQP-EGL.functional.resize.surface_size.grow = FAIL
