rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-04 19:29:15 +01:00
Code Issues Projects Releases Wiki Activity

[d3d8] Refactor D3D8Volume implementation

Browse Source
This commit is contained in:
WinterSnowfall 2025-01-09 10:19:41 +02:00 committed by Philip Rebohle
parent 7bb8819fbc
commit 9d37e4abb4
3 changed files with 47 additions and 28 deletions

39
src/d3d8/d3d8_volume.cpp Normal file

@ -0,0 +1,39 @@
#include "d3d8_volume.h"
#include "d3d8_d3d9_util.h"
namespace dxvk {
D3D8Volume::D3D8Volume(
D3D8Device* pDevice,
IDirect3DVolumeTexture8* pTexture,
Com<d3d9::IDirect3DVolume9>&& pVolume)
: D3D8VolumeBase(pDevice, std::move(pVolume), pTexture) {
}
HRESULT STDMETHODCALLTYPE D3D8Volume::GetDesc(D3DVOLUME_DESC* pDesc) {
if (unlikely(pDesc == nullptr))
return D3DERR_INVALIDCALL;
d3d9::D3DVOLUME_DESC desc;
HRESULT res = GetD3D9()->GetDesc(&desc);
if (likely(SUCCEEDED(res)))
ConvertVolumeDesc8(&desc, pDesc);
return res;
}
HRESULT STDMETHODCALLTYPE D3D8Volume::LockBox(D3DLOCKED_BOX* pLockedBox, CONST D3DBOX* pBox, DWORD Flags) {
return GetD3D9()->LockBox(
reinterpret_cast<d3d9::D3DLOCKED_BOX*>(pLockedBox),
reinterpret_cast<const d3d9::D3DBOX*>(pBox),
Flags
);
}
HRESULT STDMETHODCALLTYPE D3D8Volume::UnlockBox() {
return GetD3D9()->UnlockBox();
}
}

33
src/d3d8/d3d8_volume.h

@ -1,7 +1,6 @@
#pragma once
#include "d3d8_subresource.h"
#include "d3d8_d3d9_util.h"
namespace dxvk {
@ -11,35 +10,15 @@ namespace dxvk {
public:
D3D8Volume(
D3D8Device* pDevice,
IDirect3DVolumeTexture8* pTexture,
Com<d3d9::IDirect3DVolume9>&& pVolume)
: D3D8VolumeBase(pDevice, std::move(pVolume), pTexture) {}
D3D8Device* pDevice,
IDirect3DVolumeTexture8* pTexture,
Com<d3d9::IDirect3DVolume9>&& pVolume);
HRESULT STDMETHODCALLTYPE GetDesc(D3DVOLUME_DESC* pDesc) {
if (unlikely(pDesc == nullptr))
return D3DERR_INVALIDCALL;
HRESULT STDMETHODCALLTYPE GetDesc(D3DVOLUME_DESC* pDesc);
d3d9::D3DVOLUME_DESC desc;
HRESULT res = GetD3D9()->GetDesc(&desc);
HRESULT STDMETHODCALLTYPE LockBox(D3DLOCKED_BOX* pLockedBox, CONST D3DBOX* pBox, DWORD Flags) final;
if (likely(SUCCEEDED(res)))
ConvertVolumeDesc8(&desc, pDesc);
return res;
}
HRESULT STDMETHODCALLTYPE LockBox(D3DLOCKED_BOX* pLockedBox, CONST D3DBOX* pBox, DWORD Flags) final {
return GetD3D9()->LockBox(
reinterpret_cast<d3d9::D3DLOCKED_BOX*>(pLockedBox),
reinterpret_cast<const d3d9::D3DBOX*>(pBox),
Flags
);
}
HRESULT STDMETHODCALLTYPE UnlockBox() final {
return GetD3D9()->UnlockBox();
}
HRESULT STDMETHODCALLTYPE UnlockBox() final;
};

3
src/d3d8/meson.build

@ -10,7 +10,8 @@ d3d8_src = [
'd3d8_state_block.cpp',
'd3d8_surface.cpp',
'd3d8_swapchain.cpp',
'd3d8_texture.cpp'
'd3d8_texture.cpp',
'd3d8_volume.cpp'
]
d3d8_ld_args = []