Temp. applied patch from #12272 to test compile fix

Author: bandoti

ggml/src/ggml-vulkan/CMakeLists.txt

@@ -23,6 +23,8 @@ if (Vulkan_FOUND)
                              ../../include/ggml-vulkan.h
                             )
 
+    set(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT OFF)
+
     # Compile a test shader to determine whether GL_KHR_cooperative_matrix is supported.
     # If it's not, there will be an error to stderr.
     # If it's supported, set a define to indicate that we should compile those shaders
@@ -35,8 +37,11 @@ if (Vulkan_FOUND)
     else()
         message(STATUS "GL_KHR_cooperative_matrix supported by glslc")
         add_compile_definitions(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT)
+        set(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT ON)
     endif()
 
+    set(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT OFF)
+
     # Compile a test shader to determine whether GL_NV_cooperative_matrix2 is supported.
     # If it's not, there will be an error to stderr.
     # If it's supported, set a define to indicate that we should compile those shaders
@@ -49,6 +54,7 @@ if (Vulkan_FOUND)
     else()
         message(STATUS "GL_NV_cooperative_matrix2 supported by glslc")
         add_compile_definitions(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
+        set(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT ON)
     endif()
 
     target_link_libraries(ggml-vulkan PRIVATE Vulkan::Vulkan)
@@ -119,6 +125,8 @@ if (Vulkan_FOUND)
             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders
             CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${HOST_CMAKE_TOOLCHAIN_FILE}
                     -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
+                    -DGGML_VULKAN_COOPMAT_GLSLC_SUPPORT=${GGML_VULKAN_COOPMAT_GLSLC_SUPPORT}
+                    -DGGML_VULKAN_COOPMAT2_GLSLC_SUPPORT=${GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT}
             BUILD_COMMAND ${CMAKE_COMMAND} --build .
             INSTALL_COMMAND ${CMAKE_COMMAND} --install .
             INSTALL_DIR ${CMAKE_BINARY_DIR}

ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt

@@ -1,6 +1,12 @@
 cmake_minimum_required(VERSION 3.14) # Match top-level project
 project(vulkan-shaders-gen)
 find_package(Threads REQUIRED)
+if (GGML_VULKAN_COOPMAT_GLSLC_SUPPORT)
+	add_compile_definitions(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT)
+endif()
+if (GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
+	add_compile_definitions(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
+endif()
 set(TARGET vulkan-shaders-gen)
 add_executable(${TARGET} vulkan-shaders-gen.cpp)
 install(TARGETS ${TARGET} RUNTIME)