diff options
| author | Alexander Galazin <alexander.galazin@arm.com> | 2020-01-16 18:51:40 +0100 |
|---|---|---|
| committer | Alexander Galazin <alexander.galazin@arm.com> | 2020-01-16 18:54:09 +0100 |
| commit | b389c2911ab9ca15fd2583578ce80176243909e5 (patch) | |
| tree | 4523590759f47d549838cc10cb4874ea69b0b312 /AndroidGen.mk | |
| parent | 2c26ccd2cde9eae44f1a2fd88373157133046c3c (diff) | |
| parent | 659f5edd5d14cb4a1cd288d38fb8e5b6e680569a (diff) | |
| download | VK-GL-CTS-b389c2911ab9ca15fd2583578ce80176243909e5.tar.gz VK-GL-CTS-b389c2911ab9ca15fd2583578ce80176243909e5.tar.bz2 VK-GL-CTS-b389c2911ab9ca15fd2583578ce80176243909e5.zip | |
Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/master
Change-Id: I05f8e0d8240f265b9e150f37e580850e7a259a08
Diffstat (limited to 'AndroidGen.mk')
| -rw-r--r-- | AndroidGen.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/AndroidGen.mk b/AndroidGen.mk index 84479b2ae..1ab13bb44 100644 --- 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 \ @@ -323,6 +324,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 \ |