From fb7035f16adfb078cfa4e7d22ae4103d73a6896b Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Sat, 24 Jul 2021 17:57:15 +0100 Subject: [PATCH] [d3d9] Remove D3D9CommonBuffer::GetDesc We already have ::Desc() --- src/d3d9/d3d9_buffer.cpp | 28 +++++++++++++--------------- src/d3d9/d3d9_common_buffer.cpp | 6 ------ src/d3d9/d3d9_common_buffer.h | 3 --- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/d3d9/d3d9_buffer.cpp b/src/d3d9/d3d9_buffer.cpp index f917e2d4..e72008c8 100644 --- a/src/d3d9/d3d9_buffer.cpp +++ b/src/d3d9/d3d9_buffer.cpp @@ -43,15 +43,14 @@ namespace dxvk { if (pDesc == nullptr) return D3DERR_INVALIDCALL; - D3D9_BUFFER_DESC desc; - m_buffer.GetDesc(&desc); + const D3D9_BUFFER_DESC* desc = m_buffer.Desc(); - pDesc->Format = static_cast(desc.Format); - pDesc->Type = desc.Type; - pDesc->Usage = desc.Usage; - pDesc->Pool = desc.Pool; - pDesc->Size = desc.Size; - pDesc->FVF = desc.FVF; + pDesc->Format = static_cast(desc->Format); + pDesc->Type = desc->Type; + pDesc->Usage = desc->Usage; + pDesc->Pool = desc->Pool; + pDesc->Size = desc->Size; + pDesc->FVF = desc->FVF; return D3D_OK; } @@ -99,14 +98,13 @@ namespace dxvk { if (pDesc == nullptr) return D3DERR_INVALIDCALL; - D3D9_BUFFER_DESC desc; - m_buffer.GetDesc(&desc); + const D3D9_BUFFER_DESC* desc = m_buffer.Desc(); - pDesc->Format = static_cast(desc.Format); - pDesc->Type = desc.Type; - pDesc->Usage = desc.Usage; - pDesc->Pool = desc.Pool; - pDesc->Size = desc.Size; + pDesc->Format = static_cast(desc->Format); + pDesc->Type = desc->Type; + pDesc->Usage = desc->Usage; + pDesc->Pool = desc->Pool; + pDesc->Size = desc->Size; return D3D_OK; } diff --git a/src/d3d9/d3d9_common_buffer.cpp b/src/d3d9/d3d9_common_buffer.cpp index b233d7a3..509f0cbf 100644 --- a/src/d3d9/d3d9_common_buffer.cpp +++ b/src/d3d9/d3d9_common_buffer.cpp @@ -39,12 +39,6 @@ namespace dxvk { } - void D3D9CommonBuffer::GetDesc( - D3D9_BUFFER_DESC* pDesc) { - *pDesc = m_desc; - } - - HRESULT D3D9CommonBuffer::ValidateBufferProperties(const D3D9_BUFFER_DESC* pDesc) { if (pDesc->Size == 0) return D3DERR_INVALIDCALL; diff --git a/src/d3d9/d3d9_common_buffer.h b/src/d3d9/d3d9_common_buffer.h index e9b58793..059bc080 100644 --- a/src/d3d9/d3d9_common_buffer.h +++ b/src/d3d9/d3d9_common_buffer.h @@ -82,9 +82,6 @@ namespace dxvk { HRESULT Unlock(); - void GetDesc( - D3D9_BUFFER_DESC* pDesc); - D3D9_COMMON_BUFFER_MAP_MODE GetMapMode() const { return (m_desc.Pool == D3DPOOL_DEFAULT && (m_desc.Usage & (D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY))) ? D3D9_COMMON_BUFFER_MAP_MODE_DIRECT