From: Pyry Haulos Date: Fri, 31 Mar 2017 21:32:14 +0000 (-0700) Subject: Merge Vulkan CTS 1.0.2.2 into goog/oc-dev X-Git-Tag: upstream/0.1.0^2^2^2~55 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a44ba43f52f7eb4eab4d9e6bde4d4eb339c79d84;hp=93e2af037c07511c2ac415ec3e55452d9cfc341d;p=platform%2Fupstream%2FVK-GL-CTS.git Merge Vulkan CTS 1.0.2.2 into goog/oc-dev Bug: 36780905 New tests: * Add tests for VK_KHR_incremental_present * Add tests for VK_GOOGLE_display_timing * Handle VK_EXT_swapchain_colorspace in swapchain tests Fixes: * Imgtec Waiver for SNORM linear filtering * Check DynamicIndexing in pipeline.image count tests * Add missing barrier in synchronization tests * Fix invalid SPIR-V in dEQP-VK.sparse_resources * Add missing flushes for basic draws * Add missing flushes for indirect draws * Fix precision mismatch issues in dEQP-VK.glsl * Fix validation errors in dEQP-VK.tessellation * Fix precision mismatch in dEQP-VK.binding_model * Fix depth stencil aspect flag in render pass input tests * Fix image layout in dEQP-VK.image * Fix validation errors in dEQP-VK.geometry * Fix issues in pipeline.timestamp.transfer_tests * Refactor vktShaderExecutor * Improve precision handling in texture.explicit_lod * Fix a compilation error on GCC 5.4 * Fix a compilation error on MSVC12 * Fix bug in reallocation callback validation * Fix input attachment layout in renderpass tests Change-Id: Ic6689e68194aeb0857a4223b523e2e893e7a2ddc --- diff --git a/.gitignore b/.gitignore index dbd311c..a7a5af1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *~ *.pyc *.user +*.class .* !.gitignore !.editorconfig diff --git a/Android.mk b/Android.mk index 70666cc..4e7bbcf 100644 --- a/Android.mk +++ b/Android.mk @@ -270,6 +270,7 @@ LOCAL_SRC_FILES := \ modules/egl/teglCreateContextExtTests.cpp \ modules/egl/teglCreateContextTests.cpp \ modules/egl/teglCreateSurfaceTests.cpp \ + modules/egl/teglGetFrameTimestampsTests.cpp \ modules/egl/teglGetProcAddressTests.cpp \ modules/egl/teglGLES1RenderUtil.cpp \ modules/egl/teglGLES2RenderUtil.cpp \ @@ -295,6 +296,7 @@ LOCAL_SRC_FILES := \ modules/egl/teglQuerySurfaceTests.cpp \ modules/egl/teglRenderCase.cpp \ modules/egl/teglRenderTests.cpp \ + modules/egl/teglRobustnessTests.cpp \ modules/egl/teglResizeTests.cpp \ modules/egl/teglSimpleConfigCase.cpp \ modules/egl/teglSurfacelessContextTests.cpp \ @@ -589,7 +591,10 @@ LOCAL_SRC_FILES := \ modules/gles31/functional/es31fNegativeShaderDirectiveTests.cpp \ modules/gles31/functional/es31fNegativeShaderFunctionTests.cpp \ modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.cpp \ + modules/gles31/functional/es31fNegativeShaderStorageTests.cpp \ modules/gles31/functional/es31fNegativeStateApiTests.cpp \ + modules/gles31/functional/es31fNegativeSSBOBlockTests.cpp \ + modules/gles31/functional/es31fNegativeTessellationTests.cpp \ modules/gles31/functional/es31fNegativeTestShared.cpp \ modules/gles31/functional/es31fNegativeTextureApiTests.cpp \ modules/gles31/functional/es31fNegativeVertexArrayApiTests.cpp \ @@ -637,6 +642,7 @@ LOCAL_SRC_FILES := \ modules/gles31/functional/es31fVertexAttributeBindingTests.cpp \ modules/gles31/functional/es31fCopyImageTests.cpp \ modules/gles31/functional/es31fDrawBuffersIndexedTests.cpp \ + modules/gles31/functional/es31fSRGBDecodeTests.cpp \ modules/gles31/stress/es31sDrawTests.cpp \ modules/gles31/stress/es31sStressTests.cpp \ modules/gles31/stress/es31sTessellationGeometryInteractionTests.cpp \ @@ -904,6 +910,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/vktWsiSurfaceTests.cpp \ external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \ external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp @@ -981,6 +988,7 @@ deqp_compile_flags := \ -DDEQP_GLES2_RUNTIME_LOAD=1 \ -DQP_SUPPORT_PNG=1 \ -Wconversion \ + -fwrapv \ -Wno-sign-conversion LOCAL_SHARED_LIBRARIES := \ @@ -1000,7 +1008,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/Android.mk b/android/cts/Android.mk index d43624f..2eb34f7 100644 --- a/android/cts/Android.mk +++ b/android/cts/Android.mk @@ -26,13 +26,16 @@ LOCAL_COMPATIBILITY_SUITE := cts LOCAL_SDK_VERSION := 22 LOCAL_SRC_FILES := $(call all-java-files-under, runner/src) -LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed-prebuilt +LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed DEQP_CASELISTS:=$(sort $(patsubst master/%,%, \ $(shell cd $(LOCAL_PATH) ; \ find -L master -maxdepth 1 -name "*.txt") \ )) LOCAL_COMPATIBILITY_SUPPORT_FILES := $(foreach file, $(DEQP_CASELISTS), $(LOCAL_PATH)/master/$(file):$(file)) +LOCAL_COMPATIBILITY_SUPPORT_FILES += $(LOCAL_PATH)/nyc/vk-master.txt:nyc-vk-master.txt +LOCAL_COMPATIBILITY_SUPPORT_FILES += $(LOCAL_PATH)/nyc/gles31-master.txt:nyc-gles31-master.txt +LOCAL_COMPATIBILITY_SUPPORT_FILES += $(LOCAL_PATH)/nyc/egl-master.txt:nyc-egl-master.txt include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/android/cts/AndroidTest.xml b/android/cts/AndroidTest.xml index 0484be6..5838cfd 100644 --- a/android/cts/AndroidTest.xml +++ b/android/cts/AndroidTest.xml @@ -24,7 +24,7 @@