Merge vk-gl-cts/dev/VK_KHR_fragment_shader_barycentric into vk-gl-cts/main

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / CMakeLists.txt

diff --git a/external/vulkancts/modules/vulkan/CMakeLists.txt b/external/vulkancts/modules/vulkan/CMakeLists.txt
index 968b60d..900545b 100644 (file)
--- a/external/vulkancts/modules/vulkan/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/CMakeLists.txt
@@ -48,6 +48,7 @@ add_subdirectory(fragment_shading_rate)
 add_subdirectory(reconvergence)
 add_subdirectory(mesh_shader)
 add_subdirectory(fragment_shading_barycentric)
+add_subdirectory(sc)
 
 
 include_directories(
@@ -98,6 +99,7 @@ include_directories(
        mesh_shader
        fragment_shading_barycentric
        ${DEQP_INL_DIR}
+       sc
        )
 
 set(DEQP_VK_SRCS
@@ -169,14 +171,70 @@ set(DEQP_VK_LIBS
        deqp-vk-fragment-shading-barycentric
        )
 
+
+set(DEQP_VKSC_LIBS
+       tcutil
+       vkscutil
+       glutil
+       deqp-vksc-api
+       deqp-vksc-pipeline
+       deqp-vksc-binding-model
+       deqp-vksc-spirv-assembly
+       deqp-vksc-shaderrender
+       deqp-vksc-shaderexecutor
+       deqp-vksc-memory
+       deqp-vksc-ubo
+       deqp-vksc-dynamic-state
+       deqp-vksc-ssbo
+       deqp-vksc-query-pool
+#x     deqp-vksc-conditional-rendering
+       deqp-vksc-draw
+       deqp-vksc-device-group
+       deqp-vksc-compute
+       deqp-vksc-image
+#x     deqp-vksc-wsi
+#x     deqp-vksc-sparse-resources
+       deqp-vksc-tessellation
+       deqp-vksc-rasterization
+       deqp-vksc-synchronization
+       deqp-vksc-clipping
+       deqp-vksc-fragment-ops
+       deqp-vksc-texture
+       deqp-vksc-geometry
+       deqp-vksc-robustness
+       deqp-vksc-render-pass
+       deqp-vksc-multiview
+       deqp-vksc-subgroups
+       deqp-vksc-ycbcr
+       deqp-vksc-protected-memory
+       deqp-vksc-memory-model
+#x     deqp-vksc-amber
+       deqp-vksc-imageless-framebuffer
+#x     deqp-vksc-transform-feedback
+       deqp-vksc-descriptor-indexing
+       deqp-vksc-fragment-shader-interlock
+#x     deqp-vksc-modifiers
+#x     deqp-vksc-ray-tracing
+#x     deqp-vksc-ray-query
+#x     deqp-vksc-postmortem
+       deqp-vksc-fragment-shading-rate
+       deqp-vksc-sc
+       )
+
+
 if (DE_COMPILER_IS_MSC AND (DE_PTR_SIZE EQUAL 4))
        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
 endif ()
 
 PCH(DEQP_VK_SRCS pch.cpp)
 
-add_deqp_module(deqp-vk "${DEQP_VK_SRCS}" "${DEQP_VK_LIBS}" vktTestPackageEntry.cpp)
+add_deqp_module(deqp-vk "${DEQP_VK_SRCS}" "${DEQP_VK_LIBS}" "tcutil-platform" vktTestPackageEntry.cpp )
 
+add_deqp_module_skip_android(deqp-vksc "${DEQP_VK_SRCS}" "${DEQP_VKSC_LIBS}" "tcutil-sc-platform" vktTestPackageEntrySC.cpp)
+target_include_directories(deqp-vksc-package BEFORE PUBLIC ${CMAKE_SOURCE_DIR}/external/vulkancts/framework/vulkan/generated/vulkansc)
+if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
+       target_include_directories(deqp-vksc BEFORE PUBLIC ${CMAKE_SOURCE_DIR}/external/vulkancts/framework/vulkan/generated/vulkansc)
+endif ()
 
 add_data_dir(deqp-vk ../../data/vulkan vulkan)
 add_data_dir(deqp-vk ../../mustpass/main/vk-default vk-default)