Fix missing return when validation fails in eglWaitNative.

BUG=angleproject:2707 Change-Id: Ibd70437e3a40a9a63b78ac9a4546c97611a97ba5 Reviewed-on: https://chromium-review.googlesource.com/1126458 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix missing return when validation fails in eglWaitNative.
072c3519 · Geoff Lang · Commit Bot · b1cc789c · 072c3519 · 072c3519
Commit 072c3519 authored Jul 04, 2018 by Geoff Lang Committed by Commit Bot Jul 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

entry_points_egl.cpp src/libGLESv2/entry_points_egl.cpp +1 -0

deqp_egl_test_expectations.txt src/tests/deqp_support/deqp_egl_test_expectations.txt +0 -2

No files found.
--- a/src/libGLESv2/entry_points_egl.cpp
+++ b/src/libGLESv2/entry_points_egl.cpp
@@ -635,6 +635,7 @@ EGLBoolean EGLAPIENTRY WaitNative(EGLint engine)
    {
        thread->setError(EglBadParameter() << "the 'engine' parameter has an unrecognized value",
                         GetDebug(), "eglWaitNative", GetDisplayIfValid(display));
+        return EGL_FALSE;
    }

    error = display->waitNative(thread->getContext(), engine);

--- a/src/tests/deqp_support/deqp_egl_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_egl_test_expectations.txt
@@ -167,7 +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.negative_api.wait_native = 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
@@ -216,7 +215,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.negative_api.wait_native = FAIL
 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