clang-format issues were found. See CONTRIBUTING.md for more information. diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp index f845965..9f22e4f 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp @@ -236,8 +236,8 @@ GLPipelineStateViewer::GLPipelineStateViewer(ICaptureContext &ctx, PipelineState RDHeaderView *header = new RDHeaderView(Qt::Horizontal, this); samp->setHeader(header); - samp->setColumns( - {tr("Slot"), tr("Object"), tr("Type"), tr("Wrap Mode"), tr("Filter"), tr("LOD Clamp"), tr("LOD Bias")}); + samp->setColumns({tr("Slot"), tr("Object"), tr("Type"), tr("Wrap Mode"), tr("Filter"), + tr("LOD Clamp"), tr("LOD Bias")}); header->setColumnStretchHints({1, 2, 2, 2, 2, 2, 2}); samp->setClearSelectionOnFocusLoss(true); @@ -948,10 +948,11 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, RDLabel filter += QFormatStr(" (%1)").arg(ToQStr(s.filter.filter)); RDTreeWidgetItem *node = new RDTreeWidgetItem({ - slotname, s.resourceId != ResourceId() ? s.resourceId : r.resourceId, ToQStr(s.type), addressing, - filter, QFormatStr("%1 - %2") - .arg(s.minLOD == -FLT_MAX ? lit("0") : QString::number(s.minLOD)) - .arg(s.maxLOD == FLT_MAX ? lit("FLT_MAX") : QString::number(s.maxLOD)), + slotname, s.resourceId != ResourceId() ? s.resourceId : r.resourceId, ToQStr(s.type), + addressing, filter, + QFormatStr("%1 - %2") + .arg(s.minLOD == -FLT_MAX ? lit("0") : QString::number(s.minLOD)) + .arg(s.maxLOD == FLT_MAX ? lit("FLT_MAX") : QString::number(s.maxLOD)), s.mipLODBias, }); diff --git a/renderdoc/api/replay/gl_pipestate.h b/renderdoc/api/replay/gl_pipestate.h index 28be21b..3385e03 100644 --- a/renderdoc/api/replay/gl_pipestate.h +++ b/renderdoc/api/replay/gl_pipestate.h @@ -339,8 +339,8 @@ struct Sampler bool operator==(const Sampler &o) const { - return resourceId == o.resourceId && type == o.type && addressS == o.addressS && addressT == o.addressT && - addressR == o.addressR && borderColor == o.borderColor && + return resourceId == o.resourceId && type == o.type && addressS == o.addressS && + addressT == o.addressT && addressR == o.addressR && borderColor == o.borderColor && compareFunction == o.compareFunction && filter == o.filter && seamlessCubeMap == o.seamlessCubeMap && maxAnisotropy == o.maxAnisotropy && maxLOD == o.maxLOD && minLOD == o.minLOD && mipLODBias == o.mipLODBias; diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp index 15d45e7..ccdec51 100644 --- a/renderdoc/driver/gl/gl_replay.cpp +++ b/renderdoc/driver/gl/gl_replay.cpp @@ -1401,7 +1401,7 @@ void GLReplay::SavePipelineState(uint32_t eventId) pipe.samplers[unit].resourceId = rm->GetOriginalID(rm->GetResID(SamplerRes(ctx, samp))); - std::map<std::string, SamplerType> samplerTypesFromString = { + std::map<std::string, SamplerType> samplerTypesFromString = { {"sampler1D", SamplerType::GSampler1D}, {"sampler2D", SamplerType::GSampler2D}, {"sampler3D", SamplerType::GSampler3D}, @@ -1421,14 +1421,16 @@ void GLReplay::SavePipelineState(uint32_t eventId) {"sampler2DArrayShadow", SamplerType::Sampler2DArrayShadow}, {"samplerCubeArrayShadow", SamplerType::SamplerCubeArrayShadow}, }; - ShaderConstantType samplerType = pipe.fragmentShader.reflection->readOnlyResources[unit].variableType; + ShaderConstantType samplerType = + pipe.fragmentShader.reflection->readOnlyResources[unit].variableType; std::string samplerName = samplerType.name.c_str(); if(samplerTypesFromString.count(samplerName)) { -