Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update glslang #1001

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Update glslang #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ if(BUILD_VULKAN)
set(ENABLE_HLSL OFF CACHE BOOL "For glslang" FORCE)
set(ENABLE_CTEST OFF CACHE BOOL "For glslang" FORCE)
set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "For glslang" FORCE)
set(ENABLE_OPT OFF CACHE BOOL "For glslang" FORCE)

set(GLSLANG_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Dev/Cpp/3rdParty/glslang/" "${CMAKE_CURRENT_SOURCE_DIR}/Dev/Cpp/3rdParty/")
add_subdirectory(Dev/Cpp/3rdParty/glslang/)
Expand Down Expand Up @@ -399,7 +400,6 @@ if (BUILD_VULKAN)
set_target_properties (GenericCodeGen PROPERTIES FOLDER Thirdparty/glslang)
set_target_properties (glslang PROPERTIES FOLDER Thirdparty/glslang)
set_target_properties (MachineIndependent PROPERTIES FOLDER Thirdparty/glslang)
set_target_properties (OGLCompiler PROPERTIES FOLDER Thirdparty/glslang)
set_target_properties (OSDependent PROPERTIES FOLDER Thirdparty/glslang)
set_target_properties (SPIRV PROPERTIES FOLDER Thirdparty/glslang)
set_target_properties (SPVRemapper PROPERTIES FOLDER Thirdparty/glslang)
Expand Down
2 changes: 1 addition & 1 deletion Dev/Cpp/3rdParty/LLGI
Open in desktop
Submodule LLGI updated 7 files
+0 −10 CMakeLists.txt
+11 −4 src/DX12/LLGI.DescriptorHeapDX12.cpp
+12 −21 src/Vulkan/LLGI.BufferVulkan.cpp
+2 −1 src/Vulkan/LLGI.BufferVulkan.h
+9 −6 src/Vulkan/LLGI.CommandListVulkan.cpp
+1 −1 thirdparty/SPIRV-Cross
+1 −1 thirdparty/glslang
2 changes: 1 addition & 1 deletion Dev/Cpp/3rdParty/glslang
Open in desktop
Submodule glslang updated 234 files
1 change: 0 additions & 1 deletion Dev/Cpp/Test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ if(BUILD_VULKAN)
PRIVATE
glslang
SPIRV
OGLCompiler
OSDependent
)

Expand Down
1 change: 0 additions & 1 deletion Dev/Cpp/TestRuntimeFramework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ if(BUILD_VULKAN)
glslang
glslang-default-resource-limits
SPIRV
OGLCompiler
OSDependent
)

Expand Down
1 change: 0 additions & 1 deletion Examples/GpuParticles/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ if (BUILD_VULKAN)
glslang
glslang-default-resource-limits
SPIRV
OGLCompiler
OSDependent
EffekseerRendererVulkan
)
Expand Down
1 change: 0 additions & 1 deletion Examples/Vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ target_link_libraries(
glslang
glslang-default-resource-limits
SPIRV
OGLCompiler
OSDependent
)

Expand Down
Loading