AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://github.com/Kangz/SPIRV-Cross

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2016-10-05 23:21:26 +02:00
commit a2d2d2e6fb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spirv_cross.cpp
View File

@ -1106,8 +1106,8 @@ void Compiler::parse(const Instruction &instruction)
case OpEntryPoint:
{
auto itr = entry_points.emplace(ops[1], SPIREntryPoint(ops[1], static_cast<ExecutionModel>(ops[0]),
extract_string(spirv, instruction.offset + 2)));
auto itr = entry_points.insert(make_pair(ops[1], SPIREntryPoint(ops[1], static_cast<ExecutionModel>(ops[0]),
extract_string(spirv, instruction.offset + 2))));
auto &e = itr.first->second;
// Strings need nul-terminator and consume the whole word.

2
spirv_glsl.cpp
View File

@ -5354,7 +5354,7 @@ string CompilerGLSL::emit_continue_block(uint32_t continue_block)
for (auto &s : statements)
{
if (!s.empty() && s.back() == ';')
s.pop_back();
s.erase(s.size() - 1, 1);
}
current_continue_block = nullptr;