From 8f46e5c9f1b5a5b9afa580a32a11a69c63d0404e Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Fri, 12 May 2017 13:26:36 -0700 Subject: [PATCH] Import fixes from Android Vulkan CTS 1.0.2 branch * Android copy of mustpass is updated to exclude waived tests. * Add missing file to Android.mk * Add -fwrapv and -Wno-delete-non-virtual-dtor to Android.mk Change-Id: I9cdb0b0490dbad4134ad085216c3969cda40747a --- Android.mk | 4 ++- android/cts/master/src/vk-waivers.txt | 50 +++++++++++++++++++++++++++++++++++ android/cts/master/vk-master.txt | 38 -------------------------- scripts/build_android_mustpass.py | 3 ++- 4 files changed, 55 insertions(+), 40 deletions(-) create mode 100644 android/cts/master/src/vk-waivers.txt diff --git a/Android.mk b/Android.mk index 202b83a..966807c 100644 --- a/Android.mk +++ b/Android.mk @@ -904,6 +904,7 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/vktTestPackage.cpp \ external/vulkancts/modules/vulkan/vktTestPackageEntry.cpp \ external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTimingTests.cpp \ + external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp \ external/vulkancts/modules/vulkan/wsi/vktWsiSharedPresentableImageTests.cpp \ external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp \ external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \ @@ -982,6 +983,7 @@ deqp_compile_flags := \ -DDEQP_GLES2_RUNTIME_LOAD=1 \ -DQP_SUPPORT_PNG=1 \ -Wconversion \ + -fwrapv \ -Wno-sign-conversion LOCAL_SHARED_LIBRARIES := \ @@ -1001,7 +1003,7 @@ LOCAL_CFLAGS += \ $(deqp_compile_flags) LOCAL_SDK_VERSION := 22 -LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -fwrapv +LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -Wno-delete-non-virtual-dtor LOCAL_NDK_STL_VARIANT := gnustl_static LOCAL_RTTI_FLAG := -frtti -fexceptions LOCAL_MULTILIB := both diff --git a/android/cts/master/src/vk-waivers.txt b/android/cts/master/src/vk-waivers.txt new file mode 100644 index 0000000..1b9e7d8 --- /dev/null +++ b/android/cts/master/src/vk-waivers.txt @@ -0,0 +1,50 @@ +# +# VK-GL-CTS Issue #336 +# +# This occurs on some versions of Imagination Technologies G6200, G6230, G6400, and G6430 +# Rogue Series 6 GPU's. +# +# The affected GPU's are unable to correctly filter CEM corners with F32 textures, this +# includes the ability to gather texels for texel gather instructions. +# +# An application using gather on an F32 texture would obtain incorrect texel values around +# the corners of the cubemap. +# +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.clamp_to_edge_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.sparse_clamp_to_edge_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.repeat_mirrored_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.sparse_repeat_mirrored_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.mirrored_repeat_clamp_to_edge +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.sparse_mirrored_repeat_clamp_to_edge +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.clamp_to_edge_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.sparse_clamp_to_edge_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.repeat_mirrored_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.sparse_repeat_mirrored_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.mirrored_repeat_clamp_to_edge +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.sparse_mirrored_repeat_clamp_to_edge +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.clamp_to_edge_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.sparse_clamp_to_edge_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.repeat_mirrored_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.sparse_repeat_mirrored_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.mirrored_repeat_clamp_to_edge +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.sparse_mirrored_repeat_clamp_to_edge +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.clamp_to_edge_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.sparse_clamp_to_edge_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.repeat_mirrored_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.sparse_repeat_mirrored_repeat +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.mirrored_repeat_clamp_to_edge +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.sparse_mirrored_repeat_clamp_to_edge +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.min_linear_mag_linear +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.sparse_min_linear_mag_linear +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.min_nearest_mipmap_nearest_mag_linear +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.sparse_min_nearest_mipmap_nearest_mag_linear +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.min_nearest_mipmap_linear_mag_linear +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.sparse_min_nearest_mipmap_linear_mag_linear +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.min_linear_mipmap_nearest_mag_linear +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.sparse_min_linear_mipmap_nearest_mag_linear +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.min_linear_mipmap_linear_mag_linear +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.sparse_min_linear_mipmap_linear_mag_linear +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.base_level.level_1 +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.base_level.sparse_level_1 +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.base_level.level_2 +dEQP-VK.glsl.texture_gather.basic.cube.depth32f.base_level.sparse_level_2 diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index e832eb7..d55ef55 100644 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -121536,30 +121536,6 @@ dEQP-VK.glsl.texture_gather.basic.cube.rgba8i.base_level.level_1 dEQP-VK.glsl.texture_gather.basic.cube.rgba8i.base_level.sparse_level_1 dEQP-VK.glsl.texture_gather.basic.cube.rgba8i.base_level.level_2 dEQP-VK.glsl.texture_gather.basic.cube.rgba8i.base_level.sparse_level_2 -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.clamp_to_edge_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.sparse_clamp_to_edge_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.repeat_mirrored_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.sparse_repeat_mirrored_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.mirrored_repeat_clamp_to_edge -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_less.sparse_mirrored_repeat_clamp_to_edge -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.clamp_to_edge_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.sparse_clamp_to_edge_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.repeat_mirrored_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.sparse_repeat_mirrored_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.mirrored_repeat_clamp_to_edge -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_pot.compare_greater.sparse_mirrored_repeat_clamp_to_edge -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.clamp_to_edge_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.sparse_clamp_to_edge_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.repeat_mirrored_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.sparse_repeat_mirrored_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.mirrored_repeat_clamp_to_edge -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_less.sparse_mirrored_repeat_clamp_to_edge -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.clamp_to_edge_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.sparse_clamp_to_edge_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.repeat_mirrored_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.sparse_repeat_mirrored_repeat -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.mirrored_repeat_clamp_to_edge -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.size_npot.compare_greater.sparse_mirrored_repeat_clamp_to_edge dEQP-VK.glsl.texture_gather.basic.cube.depth32f.no_corners.size_pot.compare_less.clamp_to_edge_repeat dEQP-VK.glsl.texture_gather.basic.cube.depth32f.no_corners.size_pot.compare_less.sparse_clamp_to_edge_repeat dEQP-VK.glsl.texture_gather.basic.cube.depth32f.no_corners.size_pot.compare_less.repeat_mirrored_repeat @@ -121584,20 +121560,6 @@ dEQP-VK.glsl.texture_gather.basic.cube.depth32f.no_corners.size_npot.compare_gre dEQP-VK.glsl.texture_gather.basic.cube.depth32f.no_corners.size_npot.compare_greater.sparse_repeat_mirrored_repeat dEQP-VK.glsl.texture_gather.basic.cube.depth32f.no_corners.size_npot.compare_greater.mirrored_repeat_clamp_to_edge dEQP-VK.glsl.texture_gather.basic.cube.depth32f.no_corners.size_npot.compare_greater.sparse_mirrored_repeat_clamp_to_edge -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.min_linear_mag_linear -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.sparse_min_linear_mag_linear -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.min_nearest_mipmap_nearest_mag_linear -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.sparse_min_nearest_mipmap_nearest_mag_linear -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.min_nearest_mipmap_linear_mag_linear -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.sparse_min_nearest_mipmap_linear_mag_linear -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.min_linear_mipmap_nearest_mag_linear -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.sparse_min_linear_mipmap_nearest_mag_linear -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.min_linear_mipmap_linear_mag_linear -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.filter_mode.sparse_min_linear_mipmap_linear_mag_linear -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.base_level.level_1 -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.base_level.sparse_level_1 -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.base_level.level_2 -dEQP-VK.glsl.texture_gather.basic.cube.depth32f.base_level.sparse_level_2 dEQP-VK.glsl.texture_gather.offset.min_required_offset.2d.rgba8.size_pot.clamp_to_edge_repeat dEQP-VK.glsl.texture_gather.offset.min_required_offset.2d.rgba8.size_pot.sparse_clamp_to_edge_repeat dEQP-VK.glsl.texture_gather.offset.min_required_offset.2d.rgba8.size_pot.repeat_mirrored_repeat diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py index ddbd5ed..616032d 100644 --- a/scripts/build_android_mustpass.py +++ b/scripts/build_android_mustpass.py @@ -439,7 +439,7 @@ MASTER_GLES31_COMMON_FILTERS = [ exclude("gles31-hw-issues.txt"), exclude("gles31-driver-issues.txt"), exclude("gles31-test-issues.txt"), - exclude("gles31-spec-issues.txt"), + exclude("gles31-spec-issues.txt") ] MASTER_GLES31_PKG = Package(module = GLES31_MODULE, configurations = [ # Master @@ -499,6 +499,7 @@ MASTER_VULKAN_FILTERS = [ exclude("vk-not-applicable.txt"), exclude("vk-excluded-tests.txt"), exclude("vk-test-issues.txt"), + exclude("vk-waivers.txt") ] MASTER_VULKAN_PKG = Package(module = VULKAN_MODULE, configurations = [ Configuration(name = "master", -- 2.7.4