diff --git a/src/d3d8/d3d8_device.cpp b/src/d3d8/d3d8_device.cpp index 0a5ab0f0d..90a67fa62 100644 --- a/src/d3d8/d3d8_device.cpp +++ b/src/d3d8/d3d8_device.cpp @@ -51,8 +51,6 @@ namespace dxvk { throw DxvkError("D3D8Device: ERROR! Failed to get D3D9 Bridge. d3d9.dll might not be DXVK!"); } - m_bridge->SetAPIName("D3D8"); - ResetState(); RecreateBackBuffersAndAutoDepthStencil(); diff --git a/src/d3d9/d3d9_bridge.cpp b/src/d3d9/d3d9_bridge.cpp index cf10e07d3..5640f1328 100644 --- a/src/d3d9/d3d9_bridge.cpp +++ b/src/d3d9/d3d9_bridge.cpp @@ -28,10 +28,6 @@ namespace dxvk { return m_device->QueryInterface(riid, ppvObject); } - void DxvkD3D8Bridge::SetAPIName(const char* name) { - m_device->m_implicitSwapchain->SetApiName(name); - } - HRESULT DxvkD3D8Bridge::UpdateTextureFromBuffer( IDirect3DSurface9* pDestSurface, IDirect3DSurface9* pSrcSurface, diff --git a/src/d3d9/d3d9_bridge.h b/src/d3d9/d3d9_bridge.h index bc835f0b0..62ccb6542 100644 --- a/src/d3d9/d3d9_bridge.h +++ b/src/d3d9/d3d9_bridge.h @@ -21,13 +21,6 @@ IDxvkD3D8Bridge : public IUnknown { using IDirect3DSurface9 = d3d9::IDirect3DSurface9; #endif - /** - * \brief Changes the API name displayed on the HUD - * - * \param [in] name The new API name - */ - virtual void SetAPIName(const char* name) = 0; - /** * \brief Updates a D3D9 surface from a D3D9 buffer * @@ -87,8 +80,6 @@ namespace dxvk { REFIID riid, void** ppvObject); - void SetAPIName(const char* name); - HRESULT UpdateTextureFromBuffer( IDirect3DSurface9* pDestSurface, IDirect3DSurface9* pSrcSurface, diff --git a/src/d3d9/d3d9_swapchain.cpp b/src/d3d9/d3d9_swapchain.cpp index 7cbd86385..0a4c8faae 100644 --- a/src/d3d9/d3d9_swapchain.cpp +++ b/src/d3d9/d3d9_swapchain.cpp @@ -1121,11 +1121,6 @@ namespace dxvk { m_wctx->frameLatencySignal->wait(m_wctx->frameId - GetActualFrameLatency()); } - void D3D9SwapChainEx::SetApiName(const char* name) { - if (m_apiHud && name) - m_apiHud->setApiName(name); - } - uint32_t D3D9SwapChainEx::GetActualFrameLatency() { uint32_t maxFrameLatency = m_parent->GetFrameLatency(); @@ -1356,7 +1351,8 @@ namespace dxvk { std::string D3D9SwapChainEx::GetApiName() { - return this->GetParent()->IsExtended() ? "D3D9Ex" : "D3D9"; + return this->GetParent()->IsD3D8Compatible() ? "D3D8" : + this->GetParent()->IsExtended() ? "D3D9Ex" : "D3D9"; } diff --git a/src/d3d9/d3d9_swapchain.h b/src/d3d9/d3d9_swapchain.h index f54e44d83..6ea0d96cb 100644 --- a/src/d3d9/d3d9_swapchain.h +++ b/src/d3d9/d3d9_swapchain.h @@ -136,8 +136,6 @@ namespace dxvk { void DestroyBackBuffers(); - void SetApiName(const char* name); - bool UpdateWindowCtx(); private: diff --git a/src/dxvk/hud/dxvk_hud_item.cpp b/src/dxvk/hud/dxvk_hud_item.cpp index b3eb38123..f80ba77d4 100644 --- a/src/dxvk/hud/dxvk_hud_item.cpp +++ b/src/dxvk/hud/dxvk_hud_item.cpp @@ -122,12 +122,6 @@ namespace dxvk::hud { } - void HudClientApiItem::setApiName(std::string api) { - std::lock_guard lock(m_mutex); - m_api = std::move(api); - } - - HudPos HudClientApiItem::render( const DxvkContextObjects& ctx, const HudPipelineKey& key, diff --git a/src/dxvk/hud/dxvk_hud_item.h b/src/dxvk/hud/dxvk_hud_item.h index 02bcd716f..866849b4e 100644 --- a/src/dxvk/hud/dxvk_hud_item.h +++ b/src/dxvk/hud/dxvk_hud_item.h @@ -171,8 +171,6 @@ namespace dxvk::hud { ~HudClientApiItem(); - void setApiName(std::string api); - HudPos render( const DxvkContextObjects& ctx, const HudPipelineKey& key,