X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Android.mk;h=e15fc9c4b52c294c1d8a6c5decb767fcdb2ea7d5;hb=786c6359c72f14a2c10c13015602025533cba4bf;hp=253f08538805edc2f775a9d6a9f653f4bc681b5f;hpb=73d2ed7239e503a6c129cfa93f89dd463cb23398;p=platform%2Fupstream%2FVK-GL-CTS.git diff --git a/Android.mk b/Android.mk index 253f085..e15fc9c 100644 --- a/Android.mk +++ b/Android.mk @@ -83,6 +83,7 @@ LOCAL_SRC_FILES := \ framework/common/tcuThreadUtil.cpp \ framework/delibs/debase/deDefs.c \ framework/delibs/debase/deFloat16.c \ + framework/delibs/debase/deFloat16Test.c \ framework/delibs/debase/deInt32.c \ framework/delibs/debase/deInt32Test.c \ framework/delibs/debase/deMath.c \ @@ -696,12 +697,15 @@ LOCAL_SRC_FILES := \ external/vulkancts/framework/vulkan/vkAllocationCallbackUtil.cpp \ external/vulkancts/framework/vulkan/vkApiVersion.cpp \ external/vulkancts/framework/vulkan/vkBinaryRegistry.cpp \ + external/vulkancts/framework/vulkan/vkBufferWithMemory.cpp \ external/vulkancts/framework/vulkan/vkBuilderUtil.cpp \ external/vulkancts/framework/vulkan/vkDebugReportUtil.cpp \ external/vulkancts/framework/vulkan/vkDefs.cpp \ external/vulkancts/framework/vulkan/vkDeviceUtil.cpp \ + external/vulkancts/framework/vulkan/vkGlslProgram.cpp \ external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp \ external/vulkancts/framework/vulkan/vkImageUtil.cpp \ + external/vulkancts/framework/vulkan/vkImageWithMemory.cpp \ external/vulkancts/framework/vulkan/vkMemUtil.cpp \ external/vulkancts/framework/vulkan/vkNullDriver.cpp \ external/vulkancts/framework/vulkan/vkPlatform.cpp \ @@ -724,6 +728,7 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp \ external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp \ external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp \ + external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp \ external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp \ external/vulkancts/modules/vulkan/api/vktApiFillBufferTests.cpp \ external/vulkancts/modules/vulkan/api/vktApiGranularityTests.cpp \ @@ -735,7 +740,6 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/binding_model/vktBindingModelTests.cpp \ external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp \ external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp \ - external/vulkancts/modules/vulkan/clipping/vktClippingUtil.cpp \ external/vulkancts/modules/vulkan/compute/vktComputeBasicComputeShaderTests.cpp \ external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp \ external/vulkancts/modules/vulkan/compute/vktComputeShaderBuiltinVarTests.cpp \ @@ -749,6 +753,8 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp \ external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp \ external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp \ + external/vulkancts/modules/vulkan/draw/vktDrawNegativeViewportHeightTests.cpp \ + external/vulkancts/modules/vulkan/draw/vktDrawShaderDrawParametersTests.cpp \ external/vulkancts/modules/vulkan/draw/vktDrawSimpleTest.cpp \ external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp \ external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp \ @@ -773,15 +779,19 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.cpp \ external/vulkancts/modules/vulkan/geometry/vktGeometryVaryingGeometryShaderTests.cpp \ external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp \ + external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp \ external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp \ external/vulkancts/modules/vulkan/image/vktImageLoadStoreUtil.cpp \ external/vulkancts/modules/vulkan/image/vktImageMultisampleLoadStoreTests.cpp \ + external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp \ external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp \ external/vulkancts/modules/vulkan/image/vktImageSizeTests.cpp \ external/vulkancts/modules/vulkan/image/vktImageTests.cpp \ external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp \ external/vulkancts/modules/vulkan/image/vktImageTexture.cpp \ + external/vulkancts/modules/vulkan/image/vktImageTranscodingSupportTests.cpp \ external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp \ + external/vulkancts/modules/vulkan/memory/vktMemoryBindingTests.cpp \ external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp \ external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp \ external/vulkancts/modules/vulkan/memory/vktMemoryRequirementsTests.cpp \ @@ -814,6 +824,9 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp \ external/vulkancts/modules/vulkan/query_pool/vktQueryPoolTests.cpp \ external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp \ + external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp \ + external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp \ + external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp \ external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp \ external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp \ external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinTests.cpp \ @@ -850,15 +863,19 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.cpp \ external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.cpp \ external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp \ + external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp \ external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp \ external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderTestUtil.cpp \ + external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp \ external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp \ external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTests.cpp \ + external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmUtils.cpp \ external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp \ external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutTests.cpp \ external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp \ external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp \ external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp \ + external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp \ external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp \ external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp \ external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp \ @@ -866,6 +883,7 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp \ external/vulkancts/modules/vulkan/synchronization/vktSynchronizationTests.cpp \ external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp \ + external/vulkancts/modules/vulkan/synchronization/vktSynchronizationWin32KeyedMutexTests.cpp \ external/vulkancts/modules/vulkan/tessellation/vktTessellationCommonEdgeTests.cpp \ external/vulkancts/modules/vulkan/tessellation/vktTessellationCoordinatesTests.cpp \ external/vulkancts/modules/vulkan/tessellation/vktTessellationFractionalSpacingTests.cpp \ @@ -893,17 +911,28 @@ LOCAL_SRC_FILES := \ external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.cpp \ external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp \ external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp \ + external/vulkancts/modules/vulkan/vktExternalMemoryUtil.cpp \ + external/vulkancts/modules/vulkan/vktDrawUtil.cpp \ external/vulkancts/modules/vulkan/vktInfoTests.cpp \ - external/vulkancts/modules/vulkan/vktRenderPassTests.cpp \ external/vulkancts/modules/vulkan/vktShaderLibrary.cpp \ external/vulkancts/modules/vulkan/vktTestCase.cpp \ external/vulkancts/modules/vulkan/vktTestCaseUtil.cpp \ external/vulkancts/modules/vulkan/vktTestGroupUtil.cpp \ 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 \ - external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp + external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp \ + external/vulkancts/modules/vulkan/ycbcr/vktYCbCrConversionTests.cpp \ + external/vulkancts/modules/vulkan/ycbcr/vktYCbCrCopyTests.cpp \ + external/vulkancts/modules/vulkan/ycbcr/vktYCbCrFormatTests.cpp \ + external/vulkancts/modules/vulkan/ycbcr/vktYCbCrImageQueryTests.cpp \ + external/vulkancts/modules/vulkan/ycbcr/vktYCbCrTests.cpp \ + external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp \ + external/vulkancts/modules/vulkan/ycbcr/vktYCbCrViewTests.cpp LOCAL_C_INCLUDES := \ frameworks/native/opengl/include \ @@ -958,6 +987,7 @@ LOCAL_C_INCLUDES := \ $(deqp_dir)/external/vulkancts/modules/vulkan/pipeline \ $(deqp_dir)/external/vulkancts/modules/vulkan/query_pool \ $(deqp_dir)/external/vulkancts/modules/vulkan/rasterization \ + $(deqp_dir)/external/vulkancts/modules/vulkan/renderpass \ $(deqp_dir)/external/vulkancts/modules/vulkan/shaderexecutor \ $(deqp_dir)/external/vulkancts/modules/vulkan/shaderrender \ $(deqp_dir)/external/vulkancts/modules/vulkan/sparse_resources \ @@ -967,7 +997,8 @@ LOCAL_C_INCLUDES := \ $(deqp_dir)/external/vulkancts/modules/vulkan/tessellation \ $(deqp_dir)/external/vulkancts/modules/vulkan/texture \ $(deqp_dir)/external/vulkancts/modules/vulkan/ubo \ - $(deqp_dir)/external/vulkancts/modules/vulkan/wsi + $(deqp_dir)/external/vulkancts/modules/vulkan/wsi \ + $(deqp_dir)/external/vulkancts/modules/vulkan/ycbcr \ deqp_compile_flags := \ -DDEQP_SUPPORT_GLES1=1 \ @@ -978,6 +1009,7 @@ deqp_compile_flags := \ -DDEQP_GLES2_RUNTIME_LOAD=1 \ -DQP_SUPPORT_PNG=1 \ -Wconversion \ + -fwrapv \ -Wno-sign-conversion LOCAL_SHARED_LIBRARIES := \ @@ -997,7 +1029,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