Skip to content

Commit dc9517f

Browse files
committed
Addition for the last commit.
1 parent 5aa0dde commit dc9517f

File tree

3 files changed

+2
-24
lines changed

3 files changed

+2
-24
lines changed

src/Layers/xrRenderDX10/dx10HW.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -139,24 +139,6 @@ void CHW::CreateDevice(HWND m_hWnd, bool move_window)
139139

140140
m_DriverType = Caps.bForceGPU_REF ? D3D_DRIVER_TYPE_REFERENCE : D3D_DRIVER_TYPE_HARDWARE;
141141

142-
// For DirectX 10 adapter is already created in create D3D.
143-
/*
144-
//. #ifdef DEBUG
145-
// Look for 'NVIDIA NVPerfHUD' adapter
146-
// If it is present, override default settings
147-
for (UINT Adapter=0;Adapter<pD3D->GetAdapterCount();Adapter++) {
148-
D3DADAPTER_IDENTIFIER9 Identifier;
149-
HRESULT Res=pD3D->GetAdapterIdentifier(Adapter,0,&Identifier);
150-
if (SUCCEEDED(Res) && (xr_strcmp(Identifier.Description,"NVIDIA PerfHUD")==0))
151-
{
152-
DevAdapter =Adapter;
153-
DevT =D3DDEVTYPE_REF;
154-
break;
155-
}
156-
}
157-
//. #endif
158-
*/
159-
160142
// Display the name of video board
161143
DXGI_ADAPTER_DESC Desc;
162144
R_CHK(m_pAdapter->GetDesc(&Desc));

src/Layers/xrRenderPC_R3/r3.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,9 +1526,7 @@ HRESULT CRender::shader_compile(LPCSTR name, DWORD const* pSrcData, UINT SrcData
15261526
includer Includer;
15271527
LPD3DBLOB pShaderBuf = NULL;
15281528
LPD3DBLOB pErrorBuf = NULL;
1529-
_result = D3DCompile(pSrcData, SrcDataLen,
1530-
"", // NULL, //LPCSTR pFileName, // NVPerfHUD bug workaround.
1531-
defines, &Includer, pFunctionName, pTarget, Flags, 0, &pShaderBuf, &pErrorBuf);
1529+
_result = D3DCompile(pSrcData, SrcDataLen, "", defines, &Includer, pFunctionName, pTarget, Flags, 0, &pShaderBuf, &pErrorBuf);
15321530

15331531
if (SUCCEEDED(_result))
15341532
{

src/Layers/xrRenderPC_R4/r4.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,9 +1615,7 @@ HRESULT CRender::shader_compile(LPCSTR name, DWORD const* pSrcData, UINT SrcData
16151615
includer Includer;
16161616
LPD3DBLOB pShaderBuf = NULL;
16171617
LPD3DBLOB pErrorBuf = NULL;
1618-
_result = D3DCompile(pSrcData, SrcDataLen,
1619-
"", // NULL, //LPCSTR pFileName, // NVPerfHUD bug workaround.
1620-
defines, &Includer, pFunctionName, pTarget, Flags, 0, &pShaderBuf, &pErrorBuf);
1618+
_result = D3DCompile(pSrcData, SrcDataLen, "", defines, &Includer, pFunctionName, pTarget, Flags, 0, &pShaderBuf, &pErrorBuf);
16211619

16221620
if (SUCCEEDED(_result))
16231621
{

0 commit comments

Comments
 (0)