X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Android.mk;h=e15fc9c4b52c294c1d8a6c5decb767fcdb2ea7d5;hb=786c6359c72f14a2c10c13015602025533cba4bf;hp=4176d26f6f04a8ac1119e2b511d19795acedafb8;hpb=bda14e462faaf385ce23bbb6b50806befba5ab6e;p=platform%2Fupstream%2FVK-GL-CTS.git diff --git a/Android.mk b/Android.mk index 4176d26..e15fc9c 100644 --- a/Android.mk +++ b/Android.mk @@ -697,6 +697,7 @@ 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 \ @@ -704,6 +705,7 @@ LOCAL_SRC_FILES := \ 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 \ @@ -738,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 \ @@ -778,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 \ @@ -819,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 \ @@ -875,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 \ @@ -903,8 +912,8 @@ LOCAL_SRC_FILES := \ 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 \ @@ -916,7 +925,14 @@ LOCAL_SRC_FILES := \ 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 \ @@ -971,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 \ @@ -980,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 \