Merge remote-tracking branch 'intorr/intorr_dev' into xd_dev

Author: Xottab-DUTY

src/Layers/xrRender/HW.cpp

@@ -206,22 +206,6 @@ void CHW::CreateDevice(HWND m_hWnd, bool move_window)
     DevAdapter = D3DADAPTER_DEFAULT;
     DevT = Caps.bForceGPU_REF ? D3DDEVTYPE_REF : D3DDEVTYPE_HAL;
 
-#ifndef MASTER_GOLD
-    // 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 //   MASTER_GOLD
-
     // Display the name of video board
     D3DADAPTER_IDENTIFIER9 adapterID;
     R_CHK(pD3D->GetAdapterIdentifier(DevAdapter, 0, &adapterID));

src/Layers/xrRender/HW.h

@@ -89,7 +89,6 @@ class CHW
 
     D3D_DRIVER_TYPE m_DriverType; //	DevT equivalent
     DXGI_SWAP_CHAIN_DESC m_ChainDesc; //	DevPP equivalent
-    bool m_bUsePerfhud;
     D3D_FEATURE_LEVEL FeatureLevel;
 #elif defined(USE_DX10)
 public:
@@ -106,7 +105,6 @@ class CHW
 
     D3D10_DRIVER_TYPE m_DriverType; //	DevT equivalent
     DXGI_SWAP_CHAIN_DESC m_ChainDesc; //	DevPP equivalent
-    bool m_bUsePerfhud;
     D3D_FEATURE_LEVEL FeatureLevel;
 #else
 private:

src/Layers/xrRenderDX10/dx10HW.cpp

@@ -80,35 +80,10 @@ void CHW::CreateD3D()
     */
 
     IDXGIFactory* pFactory;
-    R_CHK(CreateDXGIFactory(__uuidof(IDXGIFactory), (void**)(&pFactory)));
-
-    m_pAdapter = 0;
-    m_bUsePerfhud = false;
 
-#ifndef MASTER_GOLD
-    // Look for 'NVIDIA NVPerfHUD' adapter
-    // If it is present, override default settings
-    UINT i = 0;
-    while (pFactory->EnumAdapters(i, &m_pAdapter) != DXGI_ERROR_NOT_FOUND)
-    {
-        DXGI_ADAPTER_DESC desc;
-        m_pAdapter->GetDesc(&desc);
-        if (!wcscmp(desc.Description, L"NVIDIA PerfHUD"))
-        {
-            m_bUsePerfhud = true;
-            break;
-        }
-        else
-        {
-            m_pAdapter->Release();
-            m_pAdapter = 0;
-        }
-        ++i;
-    }
-#endif //   MASTER_GOLD
+    R_CHK(CreateDXGIFactory(__uuidof(IDXGIFactory), (void**)(&pFactory)));
 
-    if (!m_pAdapter)
-        pFactory->EnumAdapters(0, &m_pAdapter);
+    pFactory->EnumAdapters(0, &m_pAdapter);
 
     pFactory->Release();
 
@@ -164,27 +139,6 @@ void CHW::CreateDevice(HWND m_hWnd, bool move_window)
 
     m_DriverType = Caps.bForceGPU_REF ? D3D_DRIVER_TYPE_REFERENCE : D3D_DRIVER_TYPE_HARDWARE;
 
-    if (m_bUsePerfhud)
-        m_DriverType = D3D_DRIVER_TYPE_REFERENCE;
-
-    //  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));

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))
         {

src/Layers/xrRenderPC_R4/r2_test_hw.cpp

@@ -6,30 +6,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     return DefWindowProc(hWnd, message, wParam, lParam);
 }
 
-typedef HRESULT(__stdcall* FuncPtrD3D11CreateDeviceAndSwapChain)(IDXGIAdapter* pAdapter, D3D_DRIVER_TYPE DriverType,
-    HMODULE Software, UINT Flags, CONST D3D_FEATURE_LEVEL* pFeatureLevels, UINT FeatureLevels, UINT SDKVersion,
-    CONST DXGI_SWAP_CHAIN_DESC* pSwapChainDesc, IDXGISwapChain** ppSwapChain, ID3D11Device** ppDevice,
-    D3D_FEATURE_LEVEL* pFeatureLevel, ID3D11DeviceContext** ppImmediateContext);
-
 bool TestDX11Present()
 {
-    const auto hD3D11 = XRay::LoadModule("d3d11.dll");
-
-    if (!hD3D11->exist())
-    {
-        Log("* DX11: failed to load d3d11.dll");
-        return false;
-    }
-
-    auto pD3D11CreateDeviceAndSwapChain =
-        (FuncPtrD3D11CreateDeviceAndSwapChain)hD3D11->getProcAddress("D3D11CreateDeviceAndSwapChain");
-
-    if (!pD3D11CreateDeviceAndSwapChain)
-    {
-        Log("* DX11: failed to get address of D3D11CreateDeviceAndSwapChain");
-        return false;
-    }
-
     // Register class
     WNDCLASSEX wcex;
     ZeroMemory(&wcex, sizeof(wcex));
@@ -47,16 +25,13 @@ bool TestDX11Present()
     HWND hWnd = CreateWindow("TestDX11WindowClass", "", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT,
         CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);
 
-    DXGI_SWAP_CHAIN_DESC sd;
-
     if (!hWnd)
     {
         Msg("* DX11: failed to create window");
         return false;
     }
 
-    HRESULT hr = E_FAIL;
-
+    DXGI_SWAP_CHAIN_DESC sd;
     ZeroMemory(&sd, sizeof(sd));
     sd.BufferCount = 1;
     sd.BufferDesc.Width = 800;
@@ -77,20 +52,18 @@ bool TestDX11Present()
     ID3D11DeviceContext* pContext = NULL;
     IDXGISwapChain* pSwapChain = NULL;
 
-    hr = pD3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, pFeatureLevels, 1, D3D11_SDK_VERSION,
+    HRESULT hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, pFeatureLevels, 1, D3D11_SDK_VERSION,
         &sd, &pSwapChain, &pd3dDevice, &FeatureLevel, &pContext);
 
     if (FAILED(hr))
         Msg("* D3D11: device creation failed with hr=0x%08x", hr);
 
-    if (pContext)
-        pContext->Release();
-    if (pSwapChain)
-        pSwapChain->Release();
-    if (pd3dDevice)
-        pd3dDevice->Release();
+    _RELEASE(pSwapChain);
+    _RELEASE(pd3dDevice);
+    _RELEASE(pContext);
 
     DestroyWindow(hWnd);
+    UnregisterClass("TestDX11WindowClass", GetModuleHandle(NULL));
 
     return SUCCEEDED(hr);
 }

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))
         {

src/xrCore/FTimer.cpp

@@ -18,15 +18,9 @@ void CStatTimer::FrameEnd() {
         result = 0.99f * result + 0.01f * time;
 }
 
-XRCORE_API pauseMngr* g_pauseMngr()
+XRCORE_API pauseMngr& g_pauseMngr()
 {
-    static pauseMngr* manager = nullptr;
-
-    if (!manager)
-    {
-        manager = new pauseMngr();
-    }
-
+    static pauseMngr manager;
     return manager;
 }
 

src/xrCore/FTimer.h

@@ -23,7 +23,7 @@ class XRCORE_API pauseMngr : Noncopyable
     void UnRegister(CTimer_paused& t);
 };
 
-extern XRCORE_API pauseMngr* g_pauseMngr();
+extern XRCORE_API pauseMngr& g_pauseMngr();
 
 class XRCORE_API CTimerBase
 {
@@ -142,8 +142,8 @@ class XRCORE_API CTimer_paused_ex : public CTimer
 class XRCORE_API CTimer_paused : public CTimer_paused_ex
 {
 public:
-    CTimer_paused() { g_pauseMngr()->Register(*this); }
-    virtual ~CTimer_paused() { g_pauseMngr()->UnRegister(*this); }
+    CTimer_paused() { g_pauseMngr().Register(*this); }
+    virtual ~CTimer_paused() { g_pauseMngr().UnRegister(*this); }
 };
 
 extern XRCORE_API bool g_bEnableStatGather;

src/xrEngine/device.cpp

@@ -411,7 +411,7 @@ void CRenderDevice::Pause(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason)
                                                                         TRUE;
         if (bTimer && (!g_pGamePersistent || g_pGamePersistent->CanBePaused()))
         {
-            g_pauseMngr()->Pause(TRUE);
+            g_pauseMngr().Pause(TRUE);
 #ifdef DEBUG
             if (!xr_strcmp(reason, "li_pause_key_no_clip"))
                 TimerGlobal.Pause(FALSE);
@@ -422,10 +422,10 @@ void CRenderDevice::Pause(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason)
     }
     else
     {
-        if (bTimer && g_pauseMngr()->Paused())
+        if (bTimer && g_pauseMngr().Paused())
         {
             fTimeDelta = EPS_S + EPS_S;
-            g_pauseMngr()->Pause(FALSE);
+            g_pauseMngr().Pause(FALSE);
         }
         if (bSound)
         {
@@ -441,7 +441,7 @@ void CRenderDevice::Pause(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason)
     }
 }
 
-BOOL CRenderDevice::Paused() { return g_pauseMngr()->Paused(); }
+BOOL CRenderDevice::Paused() { return g_pauseMngr().Paused(); }
 void CRenderDevice::OnWM_Activate(WPARAM wParam, LPARAM /*lParam*/)
 {
     u16 fActive = LOWORD(wParam);

src/xrScriptEngine/script_engine.cpp

@@ -98,18 +98,14 @@ bool RunJITCommand(lua_State* ls, const char* command)
 
 const char* const CScriptEngine::GlobalNamespace = SCRIPT_GLOBAL_NAMESPACE;
 Lock CScriptEngine::stateMapLock;
-xr_unordered_map<lua_State*, CScriptEngine*>* CScriptEngine::stateMap = nullptr;
+xr_unordered_map<lua_State*, CScriptEngine*> CScriptEngine::stateMap;
 
 string4096 CScriptEngine::g_ca_stdout;
 
 void CScriptEngine::reinit()
 {
     stateMapLock.Enter();
-    if (!stateMap)
-    {
-        stateMap = new xr_unordered_map<lua_State*, CScriptEngine*>();
-        stateMap->reserve(32); // 32 lua states should be enough
-    }
+    stateMap.reserve(32); // 32 lua states should be enough
     stateMapLock.Leave();
     if (m_virtual_machine)
     {
@@ -1192,12 +1188,9 @@ CScriptEngine* CScriptEngine::GetInstance(lua_State* state)
 {
     CScriptEngine* instance = nullptr;
     stateMapLock.Enter();
-    if (stateMap)
-    {
-        auto it = stateMap->find(state);
-        if (it != stateMap->end())
-            instance = it->second;
-    }
+    auto it = stateMap.find(state);
+    if (it != stateMap.end())
+        instance = it->second;
     stateMapLock.Leave();
     return instance;
 }
@@ -1206,14 +1199,11 @@ bool CScriptEngine::RegisterState(lua_State* state, CScriptEngine* scriptEngine)
 {
     bool result = false;
     stateMapLock.Enter();
-    if (stateMap)
+    auto it = stateMap.find(state);
+    if (it == stateMap.end())
     {
-        auto it = stateMap->find(state);
-        if (it == stateMap->end())
-        {
-            stateMap->insert({state, scriptEngine});
-            result = true;
-        }
+        stateMap.insert({state, scriptEngine});
+        result = true;
     }
     stateMapLock.Leave();
     return result;
@@ -1225,14 +1215,11 @@ bool CScriptEngine::UnregisterState(lua_State* state)
         return true;
     bool result = false;
     stateMapLock.Enter();
-    if (stateMap)
+    auto it = stateMap.find(state);
+    if (it != stateMap.end())
     {
-        auto it = stateMap->find(state);
-        if (it != stateMap->end())
-        {
-            stateMap->erase(it);
-            result = true;
-        }
+        stateMap.erase(it);
+        result = true;
     }
     stateMapLock.Leave();
     return result;