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

Fix clang-format problems that were included

Browse Source 
* My git hook got silently broken :(.
This commit is contained in:
baldurk
2017-06-21 22:20:00 +01:00
parent 391e0966af
commit 08cbddf063
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/Interface/CommonPipelineState.cpp
+1 -1
View File
@@ -1318,7 +1318,7 @@ QVector<BoundResource> CommonPipelineState::GetOutputTargets()
int idx = 0;
ret.resize(rp.colorAttachments.count+rp.resolveAttachments.count);
ret.resize(rp.colorAttachments.count + rp.resolveAttachments.count);
for(int i = 0; i < rp.colorAttachments.count; i++)
{
if(rp.colorAttachments[i] < (uint32_t)fb.attachments.count)
renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+5 -4
View File
@@ -1256,7 +1256,8 @@ struct SPVInstruction
if(arg0type->type == SPVTypeData::ePointer)
arg0type = arg0type->baseType;
bool accessChain = (opcode == spv::OpAccessChain || opcode == spv::OpInBoundsAccessChain || opcode == spv::OpVectorExtractDynamic);
bool accessChain = (opcode == spv::OpAccessChain || opcode == spv::OpInBoundsAccessChain ||
opcode == spv::OpVectorExtractDynamic);
size_t start = (accessChain ? 1 : 0);
size_t count = (accessChain ? op->arguments.size() : op->literals.size());
@@ -2434,7 +2435,8 @@ string SPVModule::Disassemble(const string &entryPoint)
instr->op->complexity = maxcomplex;
if(instr->opcode != spv::OpStore && instr->opcode != spv::OpLoad &&
instr->opcode != spv::OpCompositeExtract && instr->opcode != spv::OpVectorExtractDynamic && instr->op->inlineArgs)
instr->opcode != spv::OpCompositeExtract &&
instr->opcode != spv::OpVectorExtractDynamic && instr->op->inlineArgs)
instr->op->complexity++;
// we try to merge away temp variables that are only used for a single store then a single
@@ -2827,8 +2829,7 @@ string SPVModule::Disassemble(const string &entryPoint)
// the extract elsewhere
for(size_t o = 0; o < funcops.size();)
{
if(funcops[o]->opcode == spv::OpCompositeExtract &&
funcops[o]->op->arguments[0]->op &&
if(funcops[o]->opcode == spv::OpCompositeExtract && funcops[o]->op->arguments[0]->op &&
funcops[o]->op->arguments[0]->op->type->type == SPVTypeData::eVector)
{
// count how many times this extract is used in constructing a vector