Skip to content

Commit 75f9cc0

Browse files
committed
Clang format
1 parent 6d0531b commit 75f9cc0

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

include/dxc/DXIL/DxilModule.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "dxc/DXIL/DxilSignature.h"
2121
#include "dxc/DXIL/DxilSubobject.h"
2222
#include "dxc/DXIL/DxilTypeSystem.h"
23-
#include "dxc/DXIL/DxilConstants.h"
2423

2524
#include <memory>
2625
#include <string>
@@ -348,9 +347,7 @@ class DxilModule {
348347
DXIL::PrimitiveTopology::Undefined;
349348
unsigned m_ActiveStreamMask = 0;
350349

351-
enum IntermediateFlags : uint32_t {
352-
LegacyResourceReservation = 1 << 0
353-
};
350+
enum IntermediateFlags : uint32_t { LegacyResourceReservation = 1 << 0 };
354351

355352
llvm::LLVMContext &m_Ctx;
356353
llvm::Module *m_pModule = nullptr;

lib/DXIL/DxilModule.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,8 @@ bool DxilModule::GetLegacyResourceReservation() const {
586586
return (m_IntermediateFlags & LegacyResourceReservation) != 0;
587587
}
588588

589-
void DxilModule::SetUnusedResourceBinding(UnusedResourceBinding unusedResourceBinding) {
589+
void DxilModule::SetUnusedResourceBinding(
590+
UnusedResourceBinding unusedResourceBinding) {
590591
m_unusedResourceBinding = unusedResourceBinding;
591592
}
592593

lib/HLSL/DxilCondenseResources.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,8 @@ class DxilLowerCreateHandleForLib : public ModulePass {
562562
{
563563
DxilValueCache *DVC = &getAnalysis<DxilValueCache>();
564564
bool bLocalChanged = LegalizeResources(M, DVC);
565-
if (bLocalChanged && DM.GetUnusedResourceBinding() == UnusedResourceBinding::Strip) {
565+
if (bLocalChanged &&
566+
DM.GetUnusedResourceBinding() == UnusedResourceBinding::Strip) {
566567
// Remove unused resources.
567568
bChanged |= DM.RemoveResourcesWithUnusedSymbols();
568569
}

lib/HLSL/HLModule.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,8 @@ bool RemoveResource(std::vector<std::unique_ptr<TResource>> &vec,
237237
if ((*p)->GetGlobalSymbol() != pVariable)
238238
continue;
239239

240-
if ((keepAllocated && (*p)->IsAllocated()) || unusedResourceBinding == UnusedResourceBinding::ReserveAll) {
240+
if ((keepAllocated && (*p)->IsAllocated()) ||
241+
unusedResourceBinding == UnusedResourceBinding::ReserveAll) {
241242
// Keep the resource, but it has no more symbol.
242243
(*p)->SetGlobalSymbol(UndefValue::get(pVariable->getType()));
243244
} else {

tools/clang/lib/CodeGen/CGHLSLMS.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,8 @@ CGMSHLSLRuntime::CGMSHLSLRuntime(CodeGenModule &CGM)
400400
opts.PackingStrategy = CGM.getCodeGenOpts().HLSLSignaturePackingStrategy;
401401
opts.bLegacyResourceReservation =
402402
CGM.getCodeGenOpts().HLSLLegacyResourceReservation;
403-
opts.bUnusedResourceBinding = unsigned(CGM.getCodeGenOpts().HLSLUnusedResourceBinding);
403+
opts.bUnusedResourceBinding =
404+
unsigned(CGM.getCodeGenOpts().HLSLUnusedResourceBinding);
404405
opts.bForceZeroStoreLifetimes =
405406
CGM.getCodeGenOpts().HLSLForceZeroStoreLifetimes;
406407

tools/clang/tools/dxcompiler/dxcompilerobj.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1595,7 +1595,8 @@ class DxcCompiler : public IDxcCompiler3,
15951595
compiler.getCodeGenOpts().HLSLAvoidControlFlow = Opts.AvoidFlowControl;
15961596
compiler.getCodeGenOpts().HLSLLegacyResourceReservation =
15971597
Opts.LegacyResourceReservation;
1598-
compiler.getCodeGenOpts().HLSLUnusedResourceBinding = Opts.UnusedResourceBinding;
1598+
compiler.getCodeGenOpts().HLSLUnusedResourceBinding =
1599+
Opts.UnusedResourceBinding;
15991600
compiler.getCodeGenOpts().HLSLDefines = defines;
16001601
compiler.getCodeGenOpts().HLSLPreciseOutputs = Opts.PreciseOutputs;
16011602
compiler.getCodeGenOpts().MainFileName = pMainFile;

0 commit comments

Comments
 (0)