mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed C++ version to fix compilation and added some [[maybe_unused]] to fix warnings.

Browse Source
This commit is contained in:
Patrick 2023-11-04 19:17:19 +01:00
parent ebdbba3643
commit 0d4f1c6b8d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -227,16 +227,18 @@ if(ENABLE_GLSLANG_JS)
endif() endif()
endif() endif()
# Request C++11 # BEGIN @MEWIN - 2023-11-04 - Increased to C++17 so my changes actually work when compiling the regular way.
# Request C++17
if(${CMAKE_VERSION} VERSION_LESS 3.1) if(${CMAKE_VERSION} VERSION_LESS 3.1)
# CMake versions before 3.1 do not understand CMAKE_CXX_STANDARD # CMake versions before 3.1 do not understand CMAKE_CXX_STANDARD
# remove this block once CMake >=3.1 has fixated in the ecosystem # remove this block once CMake >=3.1 has fixated in the ecosystem
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
else() else()
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
endif() endif()
# END @MEWIN
function(glslang_set_link_args TARGET) function(glslang_set_link_args TARGET)
# For MinGW compiles, statically link against the GCC and C++ runtimes. # For MinGW compiles, statically link against the GCC and C++ runtimes.
@ -402,4 +404,4 @@ if(ENABLE_GLSLANG_INSTALL)
DESTINATION DESTINATION
"${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
) )
endif() endif()

6
SPIRV/SpvTools.cpp
View File

@ -226,7 +226,7 @@ void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector
bool SpirvToolsAnalyzeDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv, bool SpirvToolsAnalyzeDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv,
std::unordered_set<uint32_t>* live_locs, std::unordered_set<uint32_t>* live_locs,
std::unordered_set<uint32_t>* live_builtins, std::unordered_set<uint32_t>* live_builtins,
spv::SpvBuildLogger* logger) [[maybe_unused]] spv::SpvBuildLogger* logger) // @MEWIN 2023-11-04 - Added [[maybe_unused]] to fix compiler warnings.
{ {
spvtools::Optimizer optimizer(target_env); spvtools::Optimizer optimizer(target_env);
optimizer.SetMessageConsumer(OptimizerMesssageConsumer); optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
@ -242,7 +242,7 @@ bool SpirvToolsAnalyzeDeadOutputStores(spv_target_env target_env, std::vector<un
void SpirvToolsEliminateDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv, void SpirvToolsEliminateDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv,
std::unordered_set<uint32_t>* live_locs, std::unordered_set<uint32_t>* live_locs,
std::unordered_set<uint32_t>* live_builtins, std::unordered_set<uint32_t>* live_builtins,
spv::SpvBuildLogger* logger) [[maybe_unused]] spv::SpvBuildLogger* logger) // @MEWIN 2023-11-04 - Added [[maybe_unused]] to fix compiler warnings.
{ {
spvtools::Optimizer optimizer(target_env); spvtools::Optimizer optimizer(target_env);
optimizer.SetMessageConsumer(OptimizerMesssageConsumer); optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
@ -259,7 +259,7 @@ void SpirvToolsEliminateDeadOutputStores(spv_target_env target_env, std::vector<
} }
void SpirvToolsEliminateDeadInputComponents(spv_target_env target_env, std::vector<unsigned int>& spirv, void SpirvToolsEliminateDeadInputComponents(spv_target_env target_env, std::vector<unsigned int>& spirv,
spv::SpvBuildLogger* logger) [[maybe_unused]] spv::SpvBuildLogger* logger) // @MEWIN 2023-11-04 - Added [[maybe_unused]] to fix compiler warnings.
{ {
spvtools::Optimizer optimizer(target_env); spvtools::Optimizer optimizer(target_env);
optimizer.SetMessageConsumer(OptimizerMesssageConsumer); optimizer.SetMessageConsumer(OptimizerMesssageConsumer);