X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Android.mk;h=7356d16db610abebe83bd4229e13b8c7da58b253;hb=a5aad1b63b3446bb42474f7437e2fdfe6191e5d1;hp=839db2613de34dfd2b5ba0d41929519df1ed81c9;hpb=378ef852bb3b711863ac31f9ded5874e0e98ab5b;p=platform%2Fupstream%2FVK-GL-CTS.git diff --git a/Android.mk b/Android.mk index 839db26..7356d16 100644 --- a/Android.mk +++ b/Android.mk @@ -743,6 +743,7 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp \ external/vulkancts/modules/vulkan/vktTestCaseUtil.cpp \ external/vulkancts/modules/vulkan/vktTestGroupUtil.cpp \ + external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp \ external/vulkancts/modules/vulkan/image/vktImageSizeTests.cpp \ external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp \ external/vulkancts/modules/vulkan/image/vktImageTexture.cpp \ @@ -768,6 +769,7 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp \ external/vulkancts/modules/vulkan/api/vktApiTests.cpp \ external/vulkancts/modules/vulkan/api/vktApiBufferComputeInstance.cpp \ + external/vulkancts/modules/vulkan/pipeline/vktPipelineEarlyFragmentTests.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp \ @@ -778,16 +780,28 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelineReferenceRenderer.cpp \ + external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelineClearUtil.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelineImageTests.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp \ external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp \ - external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp \ + external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp \ \ + external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp \ + external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp \ + external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp \ + external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp \ + external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseBinding.cpp \ + external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp \ + external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp \ + external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.cpp \ + external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp \ external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp \ + external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \ external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp \ external/vulkancts/framework/vulkan/vkBuilderUtil.cpp \ + external/vulkancts/framework/vulkan/vkDebugReportUtil.cpp \ external/vulkancts/framework/vulkan/vkSpirVProgram.cpp \ external/vulkancts/framework/vulkan/vkPrograms.cpp \ external/vulkancts/framework/vulkan/vkApiVersion.cpp \ @@ -863,6 +877,7 @@ LOCAL_C_INCLUDES := \ $(deqp_dir)/external/vulkancts/modules/vulkan/spirv_assembly \ $(deqp_dir)/external/vulkancts/modules/vulkan/ssbo \ $(deqp_dir)/external/vulkancts/modules/vulkan/ubo \ + $(deqp_dir)/external/vulkancts/modules/vulkan/sparse_resources \ $(deqp_dir)/external/vulkancts/modules/vulkan/wsi deqp_compile_flags := \ @@ -896,7 +911,7 @@ LOCAL_CFLAGS += \ $(deqp_compile_flags) LOCAL_SDK_VERSION := 9 -LOCAL_CPPFLAGS += -Wno-non-virtual-dtor +LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -fwrapv LOCAL_NDK_STL_VARIANT := gnustl_static LOCAL_RTTI_FLAG := -frtti -fexceptions LOCAL_MULTILIB := both