BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SPV compressor: Fixes a possible asserts. Attribution: spvremapper@lunarg.com

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31451 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2015-06-09 02:01:53 +00:00
parent b8478d7eac
commit 3ef22f2139
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
SPIRV/SPVRemapper.cpp
View file

@ -266,7 +266,7 @@ namespace spv {
[this](spv::Id& id) { [this](spv::Id& id) {
id = localId(id); id = localId(id);
assert(id != unused && id != unmapped); assert(id != unused && id != unmapped);
} }
); );
} }
@ -309,7 +309,7 @@ namespace spv {
if (isStripOp(opCode)) if (isStripOp(opCode))
stripInst(start); stripInst(start);
return true; return true;
}, },
op_fn_nop); op_fn_nop);
} }
@ -319,7 +319,7 @@ namespace spv {
mapped.clear(); mapped.clear();
idMapL.clear(); idMapL.clear();
nameMap.clear(); // preserve nameMap, so we don't clear that.
fnPos.clear(); fnPos.clear();
fnPosDCE.clear(); fnPosDCE.clear();
fnCalls.clear(); fnCalls.clear();
@ -342,9 +342,9 @@ namespace spv {
if (opCode == spv::Op::OpName) { if (opCode == spv::Op::OpName) {
const spv::Id target = asId(start+1); const spv::Id target = asId(start+1);
const std::string name = literalString(start+2); const std::string name = literalString(start+2);
nameMap[name] = target; nameMap[name] = target;
return true;
} else if (opCode == spv::Op::OpFunctionCall) { } else if (opCode == spv::Op::OpFunctionCall) {
++fnCalls[asId(start + 3)]; ++fnCalls[asId(start + 3)];
} else if (opCode == spv::Op::OpEntryPoint) { } else if (opCode == spv::Op::OpEntryPoint) {
@ -371,7 +371,7 @@ namespace spv {
} }
return false; return false;
}, },
[this](spv::Id& id) { localId(id, unmapped); } [this](spv::Id& id) { localId(id, unmapped); }
); );
@ -713,7 +713,6 @@ namespace spv {
); );
strip(); // strip out data we decided to eliminate strip(); // strip out data we decided to eliminate
buildLocalMaps(); // rebuild ID mapping data
} }
// remove bodies of uncalled functions // remove bodies of uncalled functions
@ -798,7 +797,6 @@ namespace spv {
); );
strip(); // strip out data we decided to eliminate strip(); // strip out data we decided to eliminate
buildLocalMaps(); // rebuild ID mapping data
} }
// remove bodies of uncalled functions // remove bodies of uncalled functions
@ -860,7 +858,7 @@ namespace spv {
[&](spv::Op opCode, unsigned start) { [&](spv::Op opCode, unsigned start) {
if (opCode == spv::OpVariable) { ++varUseCount[asId(start+2)]; return true; } if (opCode == spv::OpVariable) { ++varUseCount[asId(start+2)]; return true; }
return false; return false;
}, },
[&](spv::Id& id) { if (varUseCount[id]) ++varUseCount[id]; } [&](spv::Id& id) { if (varUseCount[id]) ++varUseCount[id]; }
); );
@ -874,7 +872,7 @@ namespace spv {
stripInst(start); stripInst(start);
} }
return true; return true;
}, },
op_fn_nop); op_fn_nop);
} }
@ -1116,6 +1114,8 @@ namespace spv {
spv.resize(strippedPos); spv.resize(strippedPos);
stripRange.clear(); stripRange.clear();
buildLocalMaps();
} }
// Strip a single binary by removing ranges given in stripRange // Strip a single binary by removing ranges given in stripRange
@ -1131,6 +1131,8 @@ namespace spv {
msg(3, 4, std::string("ID bound: ") + std::to_string(bound())); msg(3, 4, std::string("ID bound: ") + std::to_string(bound()));
strip(); // strip out data we decided to eliminate
if (options & OPT_LOADSTORE) optLoadStore(); if (options & OPT_LOADSTORE) optLoadStore();
if (options & OPT_FWD_LS) forwardLoadStores(); if (options & OPT_FWD_LS) forwardLoadStores();
if (options & DCE_FUNCS) dceFuncs(); if (options & DCE_FUNCS) dceFuncs();
@ -1139,7 +1141,6 @@ namespace spv {
if (options & MAP_TYPES) mapTypeConst(); if (options & MAP_TYPES) mapTypeConst();
if (options & MAP_NAMES) mapNames(); if (options & MAP_NAMES) mapNames();
if (options & MAP_FUNCS) mapFnBodies(); if (options & MAP_FUNCS) mapFnBodies();
// if (options & STRIP) stripDebug();
mapRemainder(); // map any unmapped IDs mapRemainder(); // map any unmapped IDs
applyMap(); // Now remap each shader to the new IDs we've come up with applyMap(); // Now remap each shader to the new IDs we've come up with