Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/master

[platform/upstream/VK-GL-CTS.git] / AndroidGen.mk

diff --git a/AndroidGen.mk b/AndroidGen.mk
index 692a186..87a1650 100644 (file)
--- a/AndroidGen.mk
+++ b/AndroidGen.mk
@@ -36,6 +36,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/framework/vulkan/vkDebugReportUtil.cpp \
        external/vulkancts/framework/vulkan/vkDefs.cpp \
        external/vulkancts/framework/vulkan/vkDeviceFeatures.cpp \
+       external/vulkancts/framework/vulkan/vkDeviceProperties.cpp \
        external/vulkancts/framework/vulkan/vkDeviceUtil.cpp \
        external/vulkancts/framework/vulkan/vkImageUtil.cpp \
        external/vulkancts/framework/vulkan/vkImageWithMemory.cpp \
@@ -59,6 +60,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/framework/vulkan/vkWsiUtil.cpp \
        external/vulkancts/framework/vulkan/vkYCbCrImageWithMemory.cpp \
        external/vulkancts/modules/vulkan/amber/vktAmberExampleTests.cpp \
+       external/vulkancts/modules/vulkan/amber/vktAmberGlslTests.cpp \
        external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp \
        external/vulkancts/modules/vulkan/amber/vktAmberHelper.cpp \
        external/vulkancts/modules/vulkan/amber/vktAmberTestCase.cpp \
@@ -120,6 +122,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawDifferingInterpolationTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawDiscardRectanglesTests.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawExplicitVertexParameterTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp \
@@ -158,6 +161,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/geometry/vktGeometryVaryingGeometryShaderTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageAstcDecodeModeTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp \
+       external/vulkancts/modules/vulkan/image/vktImageAtomicSpirvShaders.cpp \
        external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp \
        external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageLoadStoreUtil.cpp \
@@ -179,6 +183,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/memory/vktMemoryRequirementsTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryTests.cpp \
        external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp \
+       external/vulkancts/modules/vulkan/memory_model/vktMemoryModelPadding.cpp \
        external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderPassUtil.cpp \
        external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp \
        external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderUtil.cpp \
@@ -249,6 +254,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWorkgroupStorageTests.cpp \
        external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp \
        external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemYCbCrConversionTests.cpp \
+       external/vulkancts/modules/vulkan/query_pool/vktQueryPoolConcurrentTests.cpp \
        external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp \
        external/vulkancts/modules/vulkan/query_pool/vktQueryPoolPerformanceTests.cpp \
        external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp \
@@ -256,6 +262,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultipleSubpassesMultipleCommandBuffersTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp \
@@ -286,6 +293,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderIndexingTests.cpp \
+       external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderInvarianceTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLimitTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderMatrixTests.cpp \
@@ -321,6 +329,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderTestUtil.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmConditionalBranchTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmCrossStageInterfaceTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsExtensionlessTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFromHlslTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp \
@@ -329,6 +338,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmLoopDepInfTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmLoopDepLenTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPointerParameterTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPtrAccessChainTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSignedIntCompareTests.cpp \
@@ -355,8 +365,10 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsPartitionedTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp \
+       external/vulkancts/modules/vulkan/subgroups/vktSubgroupsScanHelpers.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShapeTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp \
+       external/vulkancts/modules/vulkan/subgroups/vktSubgroupsSizeControlTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp \
@@ -397,6 +409,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureShadowTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureSubgroupLodTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureSwizzleTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureTestUtil.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureTests.cpp \
@@ -419,6 +432,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/vktTestPackage.cpp \
        external/vulkancts/modules/vulkan/vktTestPackageEntry.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiColorSpaceTests.cpp \
+       external/vulkancts/modules/vulkan/wsi/vktWsiDisplayControlTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTimingTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp \
@@ -428,6 +442,7 @@ LOCAL_SRC_FILES := \
        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/vktYCbCrFilteringTests.cpp \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrFormatTests.cpp \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrImageQueryTests.cpp \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrStorageImageWriteTests.cpp \