Skip to content

Commit 89dcc4a

Browse files
committed
address final forgotten comments
1 parent b76fab2 commit 89dcc4a

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

lib/DxcSupport/dxcapi.extval.cpp

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,7 @@ HRESULT DxcDllExtValidationSupport::CreateInstance(REFCLSID clsid, REFIID riid,
4141
if (DxilSupport.IsEnabled() && clsid == CLSID_DxcValidator)
4242
return DxilSupport.CreateInstance(clsid, riid, pResult);
4343

44-
if (pResult == nullptr)
45-
return E_POINTER;
46-
if (m_dll == nullptr)
47-
return E_FAIL;
48-
HRESULT hr = m_createFn(clsid, riid, (LPVOID *)pResult);
49-
return hr;
44+
return DxcDllSupport::CreateInstance(clsid, riid, pResult);
5045
}
5146

5247
HRESULT DxcDllExtValidationSupport::CreateInstance2(IMalloc *pMalloc,
@@ -55,12 +50,5 @@ HRESULT DxcDllExtValidationSupport::CreateInstance2(IMalloc *pMalloc,
5550
if (DxilSupport.IsEnabled() && clsid == CLSID_DxcValidator)
5651
return DxilSupport.CreateInstance2(pMalloc, clsid, riid, pResult);
5752

58-
if (pResult == nullptr)
59-
return E_POINTER;
60-
if (m_dll == nullptr)
61-
return E_FAIL;
62-
if (m_createFn2 == nullptr)
63-
return E_FAIL;
64-
HRESULT hr = m_createFn2(pMalloc, clsid, riid, (LPVOID *)pResult);
65-
return hr;
53+
return DxcDllSupport::CreateInstance2(pMalloc, clsid, riid, pResult);
6654
}

tools/clang/unittests/HLSL/ValidationTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#include "dxc/DXIL/DxilShaderModel.h"
3838
#include "dxc/Support/dxcapi.extval.h"
39-
#include "dxc/Test/DxcTestUtils.h" // includes dxcapi.use.h
39+
#include "dxc/Test/DxcTestUtils.h"
4040
#include "dxc/Test/HlslTestUtils.h"
4141

4242
using namespace std;

0 commit comments

Comments
 (0)