Skip to content

Commit 3ebaa29

Browse files
committed
clean up
1 parent 6757986 commit 3ebaa29

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

llvm/include/llvm/Support/DXILABI.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ const unsigned MinWaveSize = 4;
102102
const unsigned MaxWaveSize = 128;
103103

104104
LLVM_ABI StringRef getResourceClassName(ResourceClass RC);
105-
LLVM_ABI StringRef getResourceClassNames();
106-
107105
} // namespace dxil
108106
} // namespace llvm
109107

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,8 @@ Error DXContainerWriter::writeParts(raw_ostream &OS) {
274274
for (DXContainerYAML::RootParameterLocationYaml &L :
275275
P.RootSignature->Parameters.Locations) {
276276

277-
dxbc::RootParameterType Type = dxbc::RootParameterType(L.Header.Type);
278-
dxbc::ShaderVisibility Visibility =
279-
dxbc::ShaderVisibility(L.Header.Visibility);
277+
const dxbc::RootParameterType Type = L.Header.Type;
278+
const dxbc::ShaderVisibility Visibility = L.Header.Visibility;
280279

281280
switch (Type) {
282281
case dxbc::RootParameterType::Constants32Bit: {
@@ -330,20 +329,19 @@ Error DXContainerWriter::writeParts(raw_ostream &OS) {
330329

331330
for (const auto &Param : P.RootSignature->samplers()) {
332331
mcdxbc::StaticSampler NewSampler;
333-
NewSampler.Filter = dxbc::SamplerFilter(Param.Filter);
334-
NewSampler.AddressU = dxbc::TextureAddressMode(Param.AddressU);
335-
NewSampler.AddressV = dxbc::TextureAddressMode(Param.AddressV);
336-
NewSampler.AddressW = dxbc::TextureAddressMode(Param.AddressW);
332+
NewSampler.Filter = Param.Filter;
333+
NewSampler.AddressU = Param.AddressU;
334+
NewSampler.AddressV = Param.AddressV;
335+
NewSampler.AddressW = Param.AddressW;
337336
NewSampler.MipLODBias = Param.MipLODBias;
338337
NewSampler.MaxAnisotropy = Param.MaxAnisotropy;
339-
NewSampler.ComparisonFunc = dxbc::ComparisonFunc(Param.ComparisonFunc);
340-
NewSampler.BorderColor = dxbc::StaticBorderColor(Param.BorderColor);
338+
NewSampler.ComparisonFunc = Param.ComparisonFunc;
339+
NewSampler.BorderColor = Param.BorderColor;
341340
NewSampler.MinLOD = Param.MinLOD;
342341
NewSampler.MaxLOD = Param.MaxLOD;
343342
NewSampler.ShaderRegister = Param.ShaderRegister;
344343
NewSampler.RegisterSpace = Param.RegisterSpace;
345-
NewSampler.ShaderVisibility =
346-
dxbc::ShaderVisibility(Param.ShaderVisibility);
344+
NewSampler.ShaderVisibility = Param.ShaderVisibility;
347345

348346
RS.StaticSamplers.push_back(NewSampler);
349347
}

0 commit comments

Comments
 (0)