Skip to content

Commit acfa5c0

Browse files
committed
hr check
1 parent e48506e commit acfa5c0

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

include/dxc/Support/HLSLOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ struct RewriterOpts {
115115
};
116116

117117
enum class ValidatorSelection : int {
118-
Auto, // Try internal validator; fallback to DXIL.dll
118+
Auto, // Force internal validator (even if DXIL.dll is present)
119119
Internal, // Force internal validator (even if DXIL.dll is present)
120120
External, // Use DXIL.dll, failing compilation if not available
121121
Invalid = -1 // Invalid

tools/clang/tools/dxcompiler/dxcutil.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,8 @@ bool CreateValidator(CComPtr<IDxcValidator> &pValidator,
7070
// if external was explicitly specified, but no
7171
// external validator could be found (no DXIL.dll), then error
7272
IFTBOOL(!DxilLibIsEnabled(), DXC_E_VALIDATOR_MISSING);
73-
DxilLibCreateInstance(CLSID_DxcValidator, &pValidator);
73+
IFT(DxilLibCreateInstance(CLSID_DxcValidator, &pValidator));
7474

75-
// if external was explicitly specified, but the validator
76-
// failed to be created, then error.
77-
IFTBOOL(pValidator, DXC_E_VALIDATOR_MISSING);
7875
return false;
7976
}
8077

0 commit comments

Comments
 (0)