Skip to content

Commit 11e3239

Browse files
committed
omg who left this branch with errors? :( fix the branch /Arek
1 parent dc8c343 commit 11e3239

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

3rdparty/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ add_subdirectory(simdjson simdjson EXCLUDE_FROM_ALL)
4545
set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
4646
set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
4747
set(BUILD_TESTING ${_OLD_BUILD_TESTING})
48+
set_property(TARGET simdjson PROPERTY CXX_STANDARD 17)
4849

4950
# openssl
5051
add_subdirectory(openssl openssl EXCLUDE_FROM_ALL)

src/nbl/asset/utils/ISPIRVOptimizer.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ nbl::core::smart_refctd_ptr<ICPUBuffer> ISPIRVOptimizer::optimize(const uint32_t
1919
return spvtools::CreateScalarReplacementPass();
2020
};
2121

22+
auto CreateReduceLoadSizePass = [] {
23+
return spvtools::CreateReduceLoadSizePass();
24+
};
25+
2226
using create_pass_f_t = spvtools::Optimizer::PassToken(*)();
2327
create_pass_f_t create_pass_f[EOP_COUNT]{
2428
&spvtools::CreateMergeReturnPass,
@@ -37,7 +41,7 @@ nbl::core::smart_refctd_ptr<ICPUBuffer> ISPIRVOptimizer::optimize(const uint32_t
3741
&spvtools::CreateRedundancyEliminationPass,
3842
&spvtools::CreateLoopInvariantCodeMotionPass,
3943
&spvtools::CreateCCPPass,
40-
&spvtools::CreateReduceLoadSizePass,
44+
CreateReduceLoadSizePass,
4145
&spvtools::CreateStrengthReductionPass,
4246
&spvtools::CreateIfConversionPass
4347
};

0 commit comments

Comments
 (0)