Addition for the last commit.

OpenXRay · Feb 15, 2018 · dc9517f · dc9517f
1 parent 5aa0dde
commit dc9517f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/src/Layers/xrRenderDX10/dx10HW.cpp b/src/Layers/xrRenderDX10/dx10HW.cpp
@@ -139,24 +139,6 @@ void CHW::CreateDevice(HWND m_hWnd, bool move_window)
 
     m_DriverType = Caps.bForceGPU_REF ? D3D_DRIVER_TYPE_REFERENCE : D3D_DRIVER_TYPE_HARDWARE;
 
-    //  For DirectX 10 adapter is already created in create D3D.
-    /*
-    //. #ifdef DEBUG
-    // Look for 'NVIDIA NVPerfHUD' adapter
-    // If it is present, override default settings
-    for (UINT Adapter=0;Adapter<pD3D->GetAdapterCount();Adapter++)  {
-        D3DADAPTER_IDENTIFIER9 Identifier;
-        HRESULT Res=pD3D->GetAdapterIdentifier(Adapter,0,&Identifier);
-        if (SUCCEEDED(Res) && (xr_strcmp(Identifier.Description,"NVIDIA PerfHUD")==0))
-        {
-            DevAdapter  =Adapter;
-            DevT        =D3DDEVTYPE_REF;
-            break;
-        }
-    }
-    //. #endif
-    */
-
     // Display the name of video board
     DXGI_ADAPTER_DESC Desc;
     R_CHK(m_pAdapter->GetDesc(&Desc));

diff --git a/src/Layers/xrRenderPC_R3/r3.cpp b/src/Layers/xrRenderPC_R3/r3.cpp
@@ -1526,9 +1526,7 @@ HRESULT CRender::shader_compile(LPCSTR name, DWORD const* pSrcData, UINT SrcData
         includer Includer;
         LPD3DBLOB pShaderBuf = NULL;
         LPD3DBLOB pErrorBuf = NULL;
-        _result = D3DCompile(pSrcData, SrcDataLen,
-            "", // NULL, //LPCSTR pFileName,	//	NVPerfHUD bug workaround.
-            defines, &Includer, pFunctionName, pTarget, Flags, 0, &pShaderBuf, &pErrorBuf);
+        _result = D3DCompile(pSrcData, SrcDataLen, "", defines, &Includer, pFunctionName, pTarget, Flags, 0, &pShaderBuf, &pErrorBuf);
 
         if (SUCCEEDED(_result))
         {

diff --git a/src/Layers/xrRenderPC_R4/r4.cpp b/src/Layers/xrRenderPC_R4/r4.cpp
@@ -1615,9 +1615,7 @@ HRESULT CRender::shader_compile(LPCSTR name, DWORD const* pSrcData, UINT SrcData
         includer Includer;
         LPD3DBLOB pShaderBuf = NULL;
         LPD3DBLOB pErrorBuf = NULL;
-        _result = D3DCompile(pSrcData, SrcDataLen,
-            "", // NULL, //LPCSTR pFileName,	//	NVPerfHUD bug workaround.
-            defines, &Includer, pFunctionName, pTarget, Flags, 0, &pShaderBuf, &pErrorBuf);
+        _result = D3DCompile(pSrcData, SrcDataLen, "", defines, &Includer, pFunctionName, pTarget, Flags, 0, &pShaderBuf, &pErrorBuf);
 
         if (SUCCEEDED(_result))
         {