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

Merge branch 'KhronosGroup:master' into rt_motion

Browse Source
This commit is contained in:
alelenv 2021-08-10 12:02:09 -07:00 committed by GitHub
commit da8027a9df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -198,7 +198,7 @@ elseif(MSVC)
if(ENABLE_EXCEPTIONS) if(ENABLE_EXCEPTIONS)
add_compile_options(/EHsc) # Enable Exceptions add_compile_options(/EHsc) # Enable Exceptions
else() else()
string(REGEX REPLACE /EHsc "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Try to remove default /EHsc cxx_flag string(REGEX REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Try to remove default /EHsc cxx_flag
add_compile_options(/D_HAS_EXCEPTIONS=0) add_compile_options(/D_HAS_EXCEPTIONS=0)
endif() endif()
endif() endif()

1
SPIRV/SpvBuilder.cpp
View File

@ -2812,6 +2812,7 @@ void Builder::accessChainStore(Id rvalue, Decoration nonUniform, spv::MemoryAcce
accessChain.component == NoResult) { accessChain.component == NoResult) {
for (unsigned int i = 0; i < accessChain.swizzle.size(); ++i) { for (unsigned int i = 0; i < accessChain.swizzle.size(); ++i) {
accessChain.indexChain.push_back(makeUintConstant(accessChain.swizzle[i])); accessChain.indexChain.push_back(makeUintConstant(accessChain.swizzle[i]));
accessChain.instr = NoResult;
Id base = collapseAccessChain(); Id base = collapseAccessChain();
addDecoration(base, nonUniform); addDecoration(base, nonUniform);