Added flag to be able to disable shader utilities
This commit is contained in:
parent
f306bf1042
commit
92f556ff57
7 changed files with 48 additions and 30 deletions
|
|
@ -109,35 +109,37 @@ endif()
|
|||
#################### GLSLANG #######################
|
||||
#####################################################
|
||||
|
||||
if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD)
|
||||
add_subdirectory(${PROJECT_SOURCE_DIR}/external/glslang
|
||||
${CMAKE_CURRENT_BINARY_DIR}/kompute_glslang)
|
||||
if(NOT KOMPUTE_OPT_DISABLE_SHADER_UTILS)
|
||||
if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD)
|
||||
add_subdirectory(${PROJECT_SOURCE_DIR}/external/glslang
|
||||
${CMAKE_CURRENT_BINARY_DIR}/kompute_glslang)
|
||||
|
||||
target_include_directories(
|
||||
kompute PRIVATE
|
||||
${PROJECT_SOURCE_DIR}/external/glslang)
|
||||
target_include_directories(
|
||||
kompute PRIVATE
|
||||
${PROJECT_SOURCE_DIR}/external/glslang)
|
||||
|
||||
target_link_libraries(kompute
|
||||
# Not including hlsl support
|
||||
# HLSL
|
||||
# glslang includes OGLCompiler, OSDependent, MachineIndependent
|
||||
glslang
|
||||
SPIRV
|
||||
glslang-default-resource-limits)
|
||||
else()
|
||||
find_package(glslang CONFIG REQUIRED)
|
||||
target_link_libraries(kompute
|
||||
# Not including hlsl support
|
||||
# HLSL
|
||||
# glslang includes OGLCompiler, OSDependent, MachineIndependent
|
||||
glslang
|
||||
SPIRV
|
||||
glslang-default-resource-limits)
|
||||
else()
|
||||
find_package(glslang CONFIG REQUIRED)
|
||||
|
||||
target_include_directories(
|
||||
kompute PRIVATE
|
||||
${GLSLANG_GENERATED_INCLUDEDIR})
|
||||
target_include_directories(
|
||||
kompute PRIVATE
|
||||
${GLSLANG_GENERATED_INCLUDEDIR})
|
||||
|
||||
target_link_libraries(kompute
|
||||
# Not including hlsl support
|
||||
# glslang::HLSL
|
||||
# Adding explicit dependencies to match above
|
||||
glslang
|
||||
SPIRV
|
||||
glslang-default-resource-limits)
|
||||
target_link_libraries(kompute
|
||||
# Not including hlsl support
|
||||
# glslang::HLSL
|
||||
# Adding explicit dependencies to match above
|
||||
glslang
|
||||
SPIRV
|
||||
glslang-default-resource-limits)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
|
||||
#if !defined(KOMPUTE_DISABLE_SHADER_UTILS) || !KOMPUTE_DISABLE_SHADER_UTILS
|
||||
#include "kompute/Shader.hpp"
|
||||
|
||||
namespace kp {
|
||||
|
|
@ -92,3 +93,4 @@ Shader::compile_source(const std::string& source,
|
|||
}
|
||||
|
||||
}
|
||||
#endif // DKOMPUTE_DISABLE_SHADER_UTILS
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#if !defined(KOMPUTE_DISABLE_SHADER_UTILS) || !KOMPUTE_DISABLE_SHADER_UTILS
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
|
||||
|
|
@ -54,3 +55,5 @@ public:
|
|||
|
||||
};
|
||||
}
|
||||
#endif // DKOMPUTE_DISABLE_SHADER_UTILS
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue