Skip to content

Commit c65ea46

Browse files
github-actions[bot]bob80905
authored andcommitted
chore: autopublish 2025-05-13T22:07:47Z
1 parent 722702d commit c65ea46

File tree

6 files changed

+23
-26
lines changed

6 files changed

+23
-26
lines changed

include/dxc/Support/dxcapi.use.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,8 @@ class DxcDllSupport {
7777
}
7878

7979
public:
80-
LPCSTR GetDxilDLLPath() {return DxilDLLPath.data();}
81-
void SetDxilDLLPath(LPCSTR p) {
82-
DxilDLLPath = p;
83-
}
80+
LPCSTR GetDxilDLLPath() { return DxilDLLPath.data(); }
81+
void SetDxilDLLPath(LPCSTR p) { DxilDLLPath = p; }
8482
DxcDllSupport() : m_dll(nullptr), m_createFn(nullptr), m_createFn2(nullptr) {}
8583

8684
DxcDllSupport(DxcDllSupport &&other) {
@@ -96,7 +94,7 @@ class DxcDllSupport {
9694

9795
HRESULT Initialize() {
9896
// load dxcompiler.dll
99-
return InitializeInternal(kDxCompilerLib, "DxcCreateInstance");
97+
return InitializeInternal(kDxCompilerLib, "DxcCreateInstance");
10098
}
10199

102100
HRESULT InitializeForDll(LPCSTR dll, LPCSTR entryPoint) {

lib/DxcSupport/HLSLOptions.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#include "llvm/Support/Path.h"
2626
#include "llvm/Support/raw_ostream.h"
2727

28-
#include <optional>
2928
#include <filesystem>
29+
#include <optional>
3030

3131
using namespace llvm::opt;
3232
using namespace dxc;
@@ -1043,8 +1043,7 @@ int ReadDxcOpts(const OptTable *optionTable, unsigned flagsToInclude,
10431043
opts.ValVerMinor = (unsigned long)minor64;
10441044
}
10451045

1046-
llvm::StringRef dxilDLLPathStr =
1047-
Args.getLastArgValue(OPT_dxil_dll_path);
1046+
llvm::StringRef dxilDLLPathStr = Args.getLastArgValue(OPT_dxil_dll_path);
10481047
std::filesystem::path p = dxilDLLPathStr.str();
10491048

10501049
// when the dxil_dll_path argument has an empty string,

tools/clang/tools/dxcompiler/dxcutil.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace {
5252
// return true if the internal validator was used, false otherwise
5353
bool CreateValidator(CComPtr<IDxcValidator> &pValidator,
5454
std::string DxilDLLPath = "") {
55-
55+
5656
// default behavior uses internal validator
5757
if (DxilDLLPath == "") {
5858
IFT(CreateDxcValidator(IID_PPV_ARGS(&pValidator)));
@@ -178,9 +178,9 @@ HRESULT ValidateAndAssembleToContainer(AssembleInputs &inputs) {
178178
bool bInternalValidator = CreateValidator(pValidator, inputs.DxilDLLPath);
179179
// Warning on external Validator
180180
if (!bInternalValidator) {
181-
unsigned diagID = inputs.pDiag->getCustomDiagID(
182-
clang::DiagnosticsEngine::Level::Warning,
183-
"External validator loaded at %0");
181+
unsigned diagID =
182+
inputs.pDiag->getCustomDiagID(clang::DiagnosticsEngine::Level::Warning,
183+
"External validator loaded at %0");
184184
inputs.pDiag->Report(diagID) << inputs.DxilDLLPath;
185185
}
186186

@@ -275,9 +275,9 @@ HRESULT ValidateAndAssembleToContainer(AssembleInputs &inputs) {
275275
return valHR;
276276
}
277277

278-
HRESULT ValidateRootSignatureInContainer(
279-
IDxcBlob *pRootSigContainer, clang::DiagnosticsEngine *pDiag,
280-
std::string DxilDLLPath) {
278+
HRESULT ValidateRootSignatureInContainer(IDxcBlob *pRootSigContainer,
279+
clang::DiagnosticsEngine *pDiag,
280+
std::string DxilDLLPath) {
281281
HRESULT valHR = S_OK;
282282
CComPtr<IDxcValidator> pValidator;
283283
CComPtr<IDxcOperationResult> pValResult;

tools/clang/tools/dxcompiler/dxcutil.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@ struct AssembleInputs {
7373
std::string DxilDLLPath = "";
7474
};
7575
HRESULT ValidateAndAssembleToContainer(AssembleInputs &inputs);
76-
HRESULT ValidateRootSignatureInContainer(
77-
IDxcBlob *pRootSigContainer, clang::DiagnosticsEngine *pDiag = nullptr,
76+
HRESULT
77+
ValidateRootSignatureInContainer(IDxcBlob *pRootSigContainer,
78+
clang::DiagnosticsEngine *pDiag = nullptr,
7879
std::string DxilDLLPath = "");
7980
HRESULT SetRootSignature(hlsl::DxilModule *pModule, CComPtr<IDxcBlob> pSource);
8081
void GetValidatorVersion(unsigned *pMajor, unsigned *pMinor,

tools/clang/tools/dxcompiler/dxillib.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ HRESULT DxilLibInitialize(std::string DxilDLLPath) {
2727
cs = new llvm::sys::Mutex;
2828
cs->lock();
2929
g_DllLibResult = g_DllSupport.InitializeForDll(
30-
DxilDLLPath == "" ? kDxilLib : DxilDLLPath.data(),
31-
"DxcCreateInstance");
30+
DxilDLLPath == "" ? kDxilLib : DxilDLLPath.data(), "DxcCreateInstance");
3231
cs->unlock();
3332
return S_OK;
3433
}
@@ -54,17 +53,17 @@ bool DxilLibIsEnabled(std::string DxilDLLPath) {
5453
cs->lock();
5554
if (SUCCEEDED(g_DllLibResult)) {
5655
if (!g_DllSupport.IsEnabled()) {
57-
g_DllLibResult = g_DllSupport.InitializeForDll(DxilDLLPath == "" ? kDxilLib : DxilDLLPath.data(),
58-
"DxcCreateInstance");
56+
g_DllLibResult = g_DllSupport.InitializeForDll(
57+
DxilDLLPath == "" ? kDxilLib : DxilDLLPath.data(),
58+
"DxcCreateInstance");
5959
}
6060
}
6161
cs->unlock();
6262
return SUCCEEDED(g_DllLibResult);
6363
}
6464

6565
HRESULT DxilLibCreateInstance(REFCLSID rclsid, REFIID riid,
66-
IUnknown **ppInterface,
67-
std::string DxilDLLPath) {
66+
IUnknown **ppInterface, std::string DxilDLLPath) {
6867
DXASSERT_NOMSG(ppInterface != nullptr);
6968
HRESULT hr = E_FAIL;
7069
if (DxilLibIsEnabled(DxilDLLPath)) {

tools/clang/tools/dxrfallbackcompiler/dxillib.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ bool DxilLibIsEnabled(std::string DxilDLLPath) {
4646
EnterCriticalSection(&cs);
4747
if (SUCCEEDED(g_DllLibResult)) {
4848
if (!g_DllSupport.IsEnabled()) {
49-
g_DllLibResult =
50-
g_DllSupport.InitializeForDll(DxilDLLPath == "" ? kDxilLib : DxilDLLPath.data(),
51-
"DxcCreateInstance");
49+
g_DllLibResult = g_DllSupport.InitializeForDll(
50+
DxilDLLPath == "" ? kDxilLib : DxilDLLPath.data(),
51+
"DxcCreateInstance");
5252
}
5353
}
5454
LeaveCriticalSection(&cs);

0 commit comments

Comments
 (0)