libretro/glslang
1
0
Fork 0
mirror of https://github.com/libretro/glslang.git synced 2025-01-18 21:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge issues.

Browse Source
This commit is contained in:
Dejan Mircevski 2016-01-19 10:17:33 -05:00
parent 38d039d063
commit 377f0cab26
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SPIRV/spvIR.h
View File

@ -176,7 +176,7 @@ public:
// Returns the block's merge instruction, if one exists (otherwise null). // Returns the block's merge instruction, if one exists (otherwise null).
const Instruction* getMergeInstruction() const { const Instruction* getMergeInstruction() const {
if (instructions.size() < 2) return nullptr; if (instructions.size() < 2) return nullptr;
const Instruction* nextToLast = *(instructions.cend() - 2); const Instruction* nextToLast = (instructions.cend() - 2)->get();
switch (nextToLast->getOpCode()) { switch (nextToLast->getOpCode()) {
case OpSelectionMerge: case OpSelectionMerge:
case OpLoopMerge: case OpLoopMerge:
@ -375,7 +375,7 @@ __inline Block::Block(Id id, Function& parent) : parent(parent), unreachable(fal
{ {
instructions.push_back(std::unique_ptr<Instruction>(new Instruction(id, NoType, OpLabel))); instructions.push_back(std::unique_ptr<Instruction>(new Instruction(id, NoType, OpLabel)));
instructions.back()->setBlock(this); instructions.back()->setBlock(this);
parent.getParent().mapInstruction(instructions.back()); parent.getParent().mapInstruction(instructions.back().get());
} }
__inline void Block::addInstruction(std::unique_ptr<Instruction> inst) __inline void Block::addInstruction(std::unique_ptr<Instruction> inst)