Просмотр исходного кода

vulkan: Fix GGML_VULKAN_SHADER_DEBUG_INFO (#14427)

This setting needs to be passed through to vulkan-shaders-gen
Jeff Bolz 6 месяцев назад
Родитель
Сommit
ceb1bf5a34
2 измененных файлов с 5 добавлено и 0 удалено
  1. 1 0
      ggml/src/ggml-vulkan/CMakeLists.txt
  2. 4 0
      ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt

+ 1 - 0
ggml/src/ggml-vulkan/CMakeLists.txt

@@ -99,6 +99,7 @@ if (Vulkan_FOUND)
 
 
     if (GGML_VULKAN_SHADER_DEBUG_INFO)
     if (GGML_VULKAN_SHADER_DEBUG_INFO)
         add_compile_definitions(GGML_VULKAN_SHADER_DEBUG_INFO)
         add_compile_definitions(GGML_VULKAN_SHADER_DEBUG_INFO)
+        list(APPEND VULKAN_SHADER_GEN_CMAKE_ARGS -DGGML_VULKAN_SHADER_DEBUG_INFO=ON)
     endif()
     endif()
 
 
     if (GGML_VULKAN_VALIDATE)
     if (GGML_VULKAN_VALIDATE)

+ 4 - 0
ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt

@@ -19,6 +19,10 @@ if (GGML_VULKAN_BFLOAT16_GLSLC_SUPPORT)
     add_compile_definitions(GGML_VULKAN_BFLOAT16_GLSLC_SUPPORT)
     add_compile_definitions(GGML_VULKAN_BFLOAT16_GLSLC_SUPPORT)
     message(STATUS "Enabling bfloat16 glslc support")
     message(STATUS "Enabling bfloat16 glslc support")
 endif()
 endif()
+if (GGML_VULKAN_SHADER_DEBUG_INFO)
+    add_compile_definitions(GGML_VULKAN_SHADER_DEBUG_INFO)
+    message(STATUS "Enabling shader debug info")
+endif()
 
 
 set(TARGET vulkan-shaders-gen)
 set(TARGET vulkan-shaders-gen)
 add_executable(${TARGET} vulkan-shaders-gen.cpp)
 add_executable(${TARGET} vulkan-shaders-gen.cpp)