X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Android.mk;h=7356d16db610abebe83bd4229e13b8c7da58b253;hb=64a14998467dae667cfc1bee8fc4023ced4ad06d;hp=808a7b5ee1b56d2c29950b5766cb3666bf55ecec;hpb=de7dc782e324647c9b1fef5747f4dea87a3d656d;p=platform%2Fupstream%2FVK-GL-CTS.git diff --git a/Android.mk b/Android.mk index 808a7b5..7356d16 100644 --- a/Android.mk +++ b/Android.mk @@ -294,7 +294,8 @@ LOCAL_SRC_FILES := \ modules/egl/teglTestPackage.cpp \ modules/egl/teglTestPackageEntry.cpp \ modules/egl/teglVGRenderUtil.cpp \ - modules/gles2/tes2CapabilityTests.cpp \ + modules/egl/teglMultiContextTests.cpp \ + modules/gles2/tes2CapabilityTests.cpp \ modules/gles2/tes2Context.cpp \ modules/gles2/tes2InfoTests.cpp \ modules/gles2/tes2TestCase.cpp \ @@ -567,9 +568,15 @@ LOCAL_SRC_FILES := \ modules/gles31/functional/es31fLayoutBindingTests.cpp \ modules/gles31/functional/es31fMultisampleShaderRenderCase.cpp \ modules/gles31/functional/es31fMultisampleTests.cpp \ + modules/gles31/functional/es31fNegativeAtomicCounterTests.cpp \ modules/gles31/functional/es31fNegativeBufferApiTests.cpp \ modules/gles31/functional/es31fNegativeFragmentApiTests.cpp \ + modules/gles31/functional/es31fNegativePreciseTests.cpp \ + modules/gles31/functional/es31fNegativeAdvancedBlendEquationTests.cpp \ modules/gles31/functional/es31fNegativeShaderApiTests.cpp \ + modules/gles31/functional/es31fNegativeShaderDirectiveTests.cpp \ + modules/gles31/functional/es31fNegativeShaderFunctionTests.cpp \ + modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.cpp \ modules/gles31/functional/es31fNegativeStateApiTests.cpp \ modules/gles31/functional/es31fNegativeTestShared.cpp \ modules/gles31/functional/es31fNegativeTextureApiTests.cpp \ @@ -706,6 +713,7 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateGeneralTests.cpp \ external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateImageObjectUtil.cpp \ external/vulkancts/modules/vulkan/vktTestPackage.cpp \ + external/vulkancts/modules/vulkan/vktSynchronization.cpp \ external/vulkancts/modules/vulkan/shaderexecutor/vktShaderPackingFunctionTests.cpp \ external/vulkancts/modules/vulkan/shaderexecutor/vktShaderIntegerFunctionTests.cpp \ external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp \ @@ -735,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 \ @@ -760,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 \ @@ -770,14 +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 \ @@ -795,7 +819,9 @@ LOCAL_SRC_FILES := \ external/vulkancts/framework/vulkan/vkTypeUtil.cpp \ external/vulkancts/framework/vulkan/vkImageUtil.cpp \ external/vulkancts/framework/vulkan/vkQueryUtil.cpp \ - external/vulkancts/framework/vulkan/vkRef.cpp + external/vulkancts/framework/vulkan/vkRef.cpp \ + external/vulkancts/framework/vulkan/vkWsiPlatform.cpp \ + external/vulkancts/framework/vulkan/vkWsiUtil.cpp LOCAL_C_INCLUDES := \ frameworks/native/opengl/include \ @@ -850,7 +876,9 @@ LOCAL_C_INCLUDES := \ $(deqp_dir)/external/vulkancts/modules/vulkan/shaderrender \ $(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/ubo \ + $(deqp_dir)/external/vulkancts/modules/vulkan/sparse_resources \ + $(deqp_dir)/external/vulkancts/modules/vulkan/wsi deqp_compile_flags := \ -DDEQP_SUPPORT_EGL=1 \ @@ -880,11 +908,10 @@ LOCAL_STATIC_LIBRARIES := \ libpng_ndk \ LOCAL_CFLAGS += \ - $(deqp_compile_flags) \ - -Wno-error=date-time + $(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