sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GPUDevice: Swap out glslang for shaderc

Browse Source
This commit is contained in:
Stenzek
2024-04-05 15:28:33 +10:00
parent e245884d16
commit 98241cb6ba
15 changed files with 499 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/util/CMakeLists.txt
View File

@@ -154,17 +154,6 @@ if(ENABLE_OPENGL)
endif()
endif()
if(ENABLE_VULKAN OR APPLE)
target_sources(util PRIVATE
spirv_compiler.cpp
spirv_compiler.h
)
target_link_libraries(util PRIVATE glslang)
if(APPLE)
target_link_libraries(util PRIVATE spirv-cross)
endif()
endif()
if(ENABLE_VULKAN)
target_sources(util PRIVATE
vulkan_builders.cpp
@@ -188,6 +177,10 @@ if(ENABLE_VULKAN)
target_link_libraries(util PUBLIC vulkan-headers)
endif()
if(ENABLE_VULKAN OR APPLE)
target_link_libraries(util PUBLIC Shaderc::shaderc_shared)
endif()
if(ENABLE_SDL2)
target_sources(util PRIVATE
sdl_audio_stream.cpp
@@ -270,7 +263,7 @@ elseif(APPLE)
find_library(IOK_LIBRARY IOKit REQUIRED)
find_library(METAL_LIBRARY Metal)
find_library(QUARTZCORE_LIBRARY QuartzCore)
target_link_libraries(util PRIVATE ${METAL_LIBRARY} ${QUARTZCORE_LIBRARY} ${IOK_LIBRARY})
target_link_libraries(util PRIVATE ${METAL_LIBRARY} ${QUARTZCORE_LIBRARY} ${IOK_LIBRARY} spirv-cross)
set_source_files_properties(${MAC_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS TRUE)
elseif(NOT ANDROID)
target_sources(util PRIVATE