X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Android.mk;h=7356d16db610abebe83bd4229e13b8c7da58b253;hb=14cd2645010dd9694ddfbd719c8c34a6a92b7300;hp=69e79c01d362fdb995c06aaa4edc2b2b2fcdfd47;hpb=c29c0fa1215dad96a1fe96c2c9dc01f80fb0784a;p=platform%2Fupstream%2FVK-GL-CTS.git diff --git a/Android.mk b/Android.mk index 69e79c0..7356d16 100644 --- a/Android.mk +++ b/Android.mk @@ -33,6 +33,7 @@ LOCAL_SRC_FILES := \ executor/xeXMLWriter.cpp \ framework/common/tcuApp.cpp \ framework/common/tcuArray.cpp \ + framework/common/tcuAstcUtil.cpp \ framework/common/tcuBilinearImageCompare.cpp \ framework/common/tcuCommandLine.cpp \ framework/common/tcuCompressedTexture.cpp \ @@ -81,6 +82,7 @@ LOCAL_SRC_FILES := \ framework/delibs/debase/deRandom.c \ framework/delibs/debase/deString.c \ framework/delibs/debase/deSha1.c \ + framework/delibs/decpp/deAppendList.cpp \ framework/delibs/decpp/deArrayBuffer.cpp \ framework/delibs/decpp/deArrayUtil.cpp \ framework/delibs/decpp/deBlockBuffer.cpp \ @@ -230,7 +232,6 @@ LOCAL_SRC_FILES := \ framework/randomshaders/rsgShader.cpp \ framework/randomshaders/rsgShaderGenerator.cpp \ framework/randomshaders/rsgStatement.cpp \ - framework/randomshaders/rsgTest.cpp \ framework/randomshaders/rsgToken.cpp \ framework/randomshaders/rsgUtils.cpp \ framework/randomshaders/rsgVariable.cpp \ @@ -293,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 \ @@ -569,6 +571,8 @@ LOCAL_SRC_FILES := \ 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 \ @@ -664,6 +668,7 @@ LOCAL_SRC_FILES := \ modules/glshared/glsTextureTestUtil.cpp \ modules/glshared/glsUniformBlockCase.cpp \ modules/glshared/glsVertexArrayTests.cpp \ + modules/internal/ditAstcTests.cpp \ modules/internal/ditBuildInfoTests.cpp \ modules/internal/ditSRGB8ConversionTest.cpp \ modules/internal/ditDelibsTests.cpp \ @@ -675,7 +680,148 @@ LOCAL_SRC_FILES := \ modules/internal/ditTestPackage.cpp \ modules/internal/ditSeedBuilderTests.cpp \ modules/internal/ditTestPackageEntry.cpp \ - modules/internal/ditTextureFormatTests.cpp + modules/internal/ditTextureFormatTests.cpp \ + modules/internal/ditVulkanTests.cpp \ + external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp \ + external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp \ + external/vulkancts/modules/vulkan/draw/vktDrawBufferObjectUtil.cpp \ + external/vulkancts/modules/vulkan/draw/vktDrawSimpleTest.cpp \ + external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp \ + external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp \ + external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp \ + external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp \ + external/vulkancts/modules/vulkan/vktInfoTests.cpp \ + external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderMatrixTests.cpp \ + external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderStructTests.cpp \ + external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp \ + external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderSwitchTests.cpp \ + external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderOperatorTests.cpp \ + external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderIndexingTests.cpp \ + external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp \ + external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp \ + external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderReturnTests.cpp \ + external/vulkancts/modules/vulkan/vktRenderPassTests.cpp \ + external/vulkancts/modules/vulkan/vktShaderLibrary.cpp \ + external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp \ + external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp \ + external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBufferObjectUtil.cpp \ + external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCreateInfoUtil.cpp \ + external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateTests.cpp \ + external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateVPTests.cpp \ + external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCBTests.cpp \ + external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp \ + 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 \ + external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp \ + external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp \ + external/vulkancts/modules/vulkan/shaderexecutor/vktShaderCommonFunctionTests.cpp \ + external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinTests.cpp \ + external/vulkancts/modules/vulkan/vktTestCase.cpp \ + external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp \ + external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutTests.cpp \ + external/vulkancts/modules/vulkan/query_pool/vktQueryPoolBufferObjectUtil.cpp \ + external/vulkancts/modules/vulkan/query_pool/vktQueryPoolImageObjectUtil.cpp \ + external/vulkancts/modules/vulkan/query_pool/vktQueryPoolTests.cpp \ + external/vulkancts/modules/vulkan/query_pool/vktQueryPoolCreateInfoUtil.cpp \ + external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp \ + external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp \ + external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp \ + external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp \ + external/vulkancts/modules/vulkan/memory/vktMemoryTests.cpp \ + external/vulkancts/modules/vulkan/compute/vktComputeTests.cpp \ + external/vulkancts/modules/vulkan/compute/vktComputeBasicComputeShaderTests.cpp \ + external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp \ + external/vulkancts/modules/vulkan/compute/vktComputeShaderBuiltinVarTests.cpp \ + external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp \ + external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp \ + external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.cpp \ + 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 \ + external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp \ + external/vulkancts/modules/vulkan/image/vktImageTests.cpp \ + external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp \ + external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp \ + external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTests.cpp \ + external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderTestUtil.cpp \ + external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp \ + external/vulkancts/modules/vulkan/vktTestPackageEntry.cpp \ + external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp \ + external/vulkancts/modules/vulkan/binding_model/vktBindingModelTests.cpp \ + external/vulkancts/modules/vulkan/api/vktApiComputeInstanceResultBuffer.cpp \ + external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp \ + external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp \ + external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp \ + external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp \ + external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp \ + external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp \ + external/vulkancts/modules/vulkan/api/vktApiBufferViewCreateTests.cpp \ + external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp \ + 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 \ + external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp \ + external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp \ + external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp \ + external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp \ + 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/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 \ + external/vulkancts/framework/vulkan/vkBinaryRegistry.cpp \ + external/vulkancts/framework/vulkan/vkPlatform.cpp \ + external/vulkancts/framework/vulkan/vkDeviceUtil.cpp \ + external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp \ + external/vulkancts/framework/vulkan/vkDefs.cpp \ + external/vulkancts/framework/vulkan/vkMemUtil.cpp \ + external/vulkancts/framework/vulkan/vkAllocationCallbackUtil.cpp \ + external/vulkancts/framework/vulkan/vkRefUtil.cpp \ + external/vulkancts/framework/vulkan/vkSpirVAsm.cpp \ + external/vulkancts/framework/vulkan/vkNullDriver.cpp \ + external/vulkancts/framework/vulkan/vkStrUtil.cpp \ + 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/vkWsiPlatform.cpp \ + external/vulkancts/framework/vulkan/vkWsiUtil.cpp LOCAL_C_INCLUDES := \ frameworks/native/opengl/include \ @@ -714,7 +860,25 @@ LOCAL_C_INCLUDES := \ $(deqp_dir)/modules/glshared \ $(deqp_dir)/modules/glusecases \ $(deqp_dir)/executor \ - $(deqp_dir)/execserver + $(deqp_dir)/execserver \ + $(deqp_dir)/external/vulkancts/framework/vulkan \ + $(deqp_dir)/external/vulkancts/modules/vulkan \ + $(deqp_dir)/external/vulkancts/modules/vulkan/api \ + $(deqp_dir)/external/vulkancts/modules/vulkan/binding_model \ + $(deqp_dir)/external/vulkancts/modules/vulkan/compute \ + $(deqp_dir)/external/vulkancts/modules/vulkan/draw \ + $(deqp_dir)/external/vulkancts/modules/vulkan/dynamic_state \ + $(deqp_dir)/external/vulkancts/modules/vulkan/image \ + $(deqp_dir)/external/vulkancts/modules/vulkan/memory \ + $(deqp_dir)/external/vulkancts/modules/vulkan/pipeline \ + $(deqp_dir)/external/vulkancts/modules/vulkan/query_pool \ + $(deqp_dir)/external/vulkancts/modules/vulkan/shaderexecutor \ + $(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/sparse_resources \ + $(deqp_dir)/external/vulkancts/modules/vulkan/wsi deqp_compile_flags := \ -DDEQP_SUPPORT_EGL=1 \ @@ -737,15 +901,17 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libm \ libc \ - libpng \ libz \ libdl +LOCAL_STATIC_LIBRARIES := \ + libpng_ndk \ + 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