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

[d3d9] Adjust pLockedRect/pLockedBox clearing and return behavior

Browse Source
This commit is contained in:
WinterSnowfall 2024-10-11 23:52:19 +03:00 committed by Philip Rebohle
parent 63d9affdcb
commit a0d48cd2a2
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/d3d9/d3d9_surface.cpp
View File

@ -124,9 +124,16 @@ namespace dxvk {
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
D3DBOX box; D3DBOX box;
D3DRESOURCETYPE type = m_texture->GetType();
if (m_texture->Device()->IsD3D8Compatible() && type != D3DRTYPE_TEXTURE) {
// D3D8 LockRect clears any existing content present in
// pLockedRect for anything beside D3DRTYPE_TEXTURE surfaces
pLockedRect->pBits = nullptr;
pLockedRect->Pitch = 0;
}
if (unlikely(pRect != nullptr)) { if (unlikely(pRect != nullptr)) {
D3DRESOURCETYPE type = m_texture->GetType();
auto& desc = *(m_texture->Desc()); auto& desc = *(m_texture->Desc());
D3D9_FORMAT_BLOCK_SIZE blockSize = GetFormatBlockSize(desc.Format); D3D9_FORMAT_BLOCK_SIZE blockSize = GetFormatBlockSize(desc.Format);
@ -168,6 +175,8 @@ namespace dxvk {
pRect != nullptr ? &box : nullptr, pRect != nullptr ? &box : nullptr,
Flags); Flags);
if (FAILED(hr)) return hr;
pLockedRect->pBits = lockedBox.pBits; pLockedRect->pBits = lockedBox.pBits;
pLockedRect->Pitch = lockedBox.RowPitch; pLockedRect->Pitch = lockedBox.RowPitch;

21
src/d3d9/d3d9_volume.cpp
View File

@ -97,12 +97,29 @@ namespace dxvk {
if (unlikely(pLockedBox == nullptr)) if (unlikely(pLockedBox == nullptr))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
return m_parent->LockImage( if (m_texture->Device()->IsD3D8Compatible()) {
// D3D8 LockBox clears any existing content present in pLockedBox
pLockedBox->pBits = nullptr;
pLockedBox->RowPitch = 0;
pLockedBox->SlicePitch = 0;
}
D3DLOCKED_BOX lockedBox;
HRESULT hr = m_parent->LockImage(
m_texture, m_texture,
m_face, m_mipLevel, m_face, m_mipLevel,
pLockedBox, &lockedBox,
pBox, pBox,
Flags); Flags);
if (FAILED(hr)) return hr;
pLockedBox->pBits = lockedBox.pBits;
pLockedBox->RowPitch = lockedBox.RowPitch;
pLockedBox->SlicePitch = lockedBox.SlicePitch;
return hr;
} }