lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-17 11:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve OpDecoder's AddUsedIDs to instead call a callback per-ID

Browse Source 
* Also fix handling of opcodes that take a variable number of IDs
This commit is contained in:
baldurk
2020-02-24 18:10:56 +00:00
parent a81d5c78b2
commit 55ea78f331
4 changed files with 1882 additions and 1877 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/gen_spirv_code.py
+9 -5
View File
@@ -954,9 +954,6 @@ for inst in spirv['instructions']:
complex_type = True
manual_init += ' uint32_t word = {};\n'.format(all_size)
if kind['is_id']:
used_ids += ' usedids.insert(Id::fromWord(it.word({})));\n'.format(all_size)
quantifier = ''
if 'quantifier' in operand:
@@ -968,6 +965,12 @@ for inst in spirv['instructions']:
if quantifier == '*':
manual_init += ' uint32_t word = {};\n'.format(all_size)
if kind['is_id']:
if quantifier == '*':
used_ids += ' for(size_t i=0; i < size-{0}; i++) callback(Id::fromWord(it.word({0}+i)), {1});\n'.format(all_size, 'true' if i+1==result else 'false')
else:
used_ids += ' callback(Id::fromWord(it.word({})), {});\n'.format(all_size, 'true' if i+1==result else 'false')
if kind['size'] < 0:
size_name = 'MinWordSize'
construct_size = 'MinWordSize'
@@ -1168,7 +1171,7 @@ struct OpDecoder
{{
OpDecoder(const ConstIter &it);
static void AddUsedIDs(std::set<Id> &usedids, const ConstIter &it);
static void ForEachID(const ConstIter &it, const std::function<void(Id,bool)> &callback);
static rdcstr Disassemble(const ConstIter &it, const std::function<rdcstr(Id,Id)> &declName, const std::function<rdcstr(rdcspv::Id)> &idName, const std::function<uint32_t(Id)> &constIntVal);
Op op;
@@ -1223,8 +1226,9 @@ rdcstr ParamToStr(const std::function<rdcstr(rdcspv::Id)> &idName, const PairIdR
{tostrs}
void OpDecoder::AddUsedIDs(std::set<Id> &usedids, const ConstIter &it)
void OpDecoder::ForEachID(const ConstIter &it, const std::function<void(Id,bool)> &callback)
{{
size_t size = it.size();
switch(it.opcode())
{{
{used_ids}
renderdoc/driver/shaders/spirv/spirv_gen.cpp
+1871 -1870
View File
File diff suppressed because it is too large Load Diff
renderdoc/driver/shaders/spirv/spirv_op_helpers.h
+1 -1
View File
@@ -16364,7 +16364,7 @@ struct OpDecoder
{
OpDecoder(const ConstIter &it);
static void AddUsedIDs(std::set<Id> &usedids, const ConstIter &it);
static void ForEachID(const ConstIter &it, const std::function<void(Id,bool)> &callback);
static rdcstr Disassemble(const ConstIter &it, const std::function<rdcstr(Id,Id)> &declName, const std::function<rdcstr(rdcspv::Id)> &idName, const std::function<uint32_t(Id)> &constIntVal);
Op op;
renderdoc/driver/shaders/spirv/spirv_reflect.cpp
+1 -1
View File
@@ -686,7 +686,7 @@ void Reflector::MakeReflection(const GraphicsAPI sourceAPI, const ShaderStage st
while(it.opcode() != Op::FunctionEnd)
{
OpDecoder::AddUsedIDs(usedIds, it);
OpDecoder::ForEachID(it, [&usedIds](Id id, bool result) { usedIds.insert(id); });
if(it.opcode() == Op::AccessChain || it.opcode() == Op::InBoundsAccessChain)
{