Skip to content

A
angle
Commit 7e821ac1 by Tim Van Patten Committed by Commit Bot
Options

Android: Enable dEQP-EGL.functional.query_context.*

Exclude the Nexus 5x from the following tests: dEQP-EGL.functional.query_context.get_current_context.* dEQP-EGL.functional.query_context.get_current_display.* dEQP-EGL.functional.query_context.get_current_surface.r* dEQP-EGL.functional.query_context.query_context.* Bug: angleproject:3159 Change-Id: Ib02553944b952a687d5e10d624756310627b81c5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1559204Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>
parent 6b60dfd8
Showing with 11 additions and 4 deletions
src/tests/deqp_support/deqp_egl_test_expectations.txt
...@@ -190,10 +190,6 @@ ...@@ -190,10 +190,6 @@
2546 ANDROID : dEQP-EGL.functional.partial_update.odd_clear_* = FAIL 2546 ANDROID : dEQP-EGL.functional.partial_update.odd_clear_* = FAIL
2546 ANDROID : dEQP-EGL.functional.partial_update.odd_render_* = FAIL 2546 ANDROID : dEQP-EGL.functional.partial_update.odd_render_* = FAIL
2546 ANDROID : dEQP-EGL.functional.partial_update.render_* = FAIL 2546 ANDROID : dEQP-EGL.functional.partial_update.render_* = FAIL
2546 ANDROID : dEQP-EGL.functional.query_context.get_current_context.* = SKIP
2546 ANDROID : dEQP-EGL.functional.query_context.get_current_display.* = SKIP
2546 ANDROID : dEQP-EGL.functional.query_context.get_current_surface.r* = FAIL
2546 ANDROID : dEQP-EGL.functional.query_context.query_context.* = SKIP
2546 ANDROID : dEQP-EGL.functional.render.multi_context.* = SKIP 2546 ANDROID : dEQP-EGL.functional.render.multi_context.* = SKIP
2546 ANDROID : dEQP-EGL.functional.render.single_context.* = SKIP 2546 ANDROID : dEQP-EGL.functional.render.single_context.* = SKIP
2546 ANDROID : dEQP-EGL.functional.thread_cleanup.multi_context_* = SKIP 2546 ANDROID : dEQP-EGL.functional.thread_cleanup.multi_context_* = SKIP
...@@ -237,3 +233,9 @@ ...@@ -237,3 +233,9 @@
// Tests were being hidden by flakiness (anglebug.com/3271) // Tests were being hidden by flakiness (anglebug.com/3271)
3325 : dEQP-EGL.functional.fence_sync.* = SKIP 3325 : dEQP-EGL.functional.fence_sync.* = SKIP
3325 : dEQP-EGL.functional.reusable_sync.* = SKIP 3325 : dEQP-EGL.functional.reusable_sync.* = SKIP
// Nexus 5x
2546 NEXUS5X : dEQP-EGL.functional.query_context.get_current_context.* = SKIP
2546 NEXUS5X : dEQP-EGL.functional.query_context.get_current_display.* = SKIP
2546 NEXUS5X : dEQP-EGL.functional.query_context.get_current_surface.r* = FAIL
2546 NEXUS5X : dEQP-EGL.functional.query_context.query_context.* = SKIP
\ No newline at end of file
src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp
...@@ -181,6 +181,9 @@ ANGLENativeDisplay::ANGLENativeDisplay(std::vector<EGLAttrib> attribs) ...@@ -181,6 +181,9 @@ ANGLENativeDisplay::ANGLENativeDisplay(std::vector<EGLAttrib> attribs)
NativePixmap::NativePixmap(EGLNativeDisplayType display, int width, int height, int bitDepth) NativePixmap::NativePixmap(EGLNativeDisplayType display, int width, int height, int bitDepth)
: eglu::NativePixmap(kBitmapCapabilities), mPixmap(CreateOSPixmap()) : eglu::NativePixmap(kBitmapCapabilities), mPixmap(CreateOSPixmap())
{ {
#if (DE_OS == DE_OS_ANDROID)
throw tcu::NotSupportedError("Pixmap not supported on Android");
#else
if (!mPixmap) if (!mPixmap)
{ {
throw ResourceError("Failed to create pixmap", DE_NULL, __FILE__, __LINE__); throw ResourceError("Failed to create pixmap", DE_NULL, __FILE__, __LINE__);
...@@ -190,6 +193,7 @@ NativePixmap::NativePixmap(EGLNativeDisplayType display, int width, int height, ...@@ -190,6 +193,7 @@ NativePixmap::NativePixmap(EGLNativeDisplayType display, int width, int height,
{ {
throw ResourceError("Failed to initialize pixmap", DE_NULL, __FILE__, __LINE__); throw ResourceError("Failed to initialize pixmap", DE_NULL, __FILE__, __LINE__);
} }
#endif
} }
NativePixmap::~NativePixmap() NativePixmap::~NativePixmap()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment