Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[d3d8] Handle DEFAULT->MANAGED in CopyRects #184

Merged
merged 1 commit into from
Jul 7, 2024
Merged

[d3d8] Handle DEFAULT->MANAGED in CopyRects #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions src/d3d8/d3d8_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,14 +541,14 @@ namespace dxvk {
* The following table shows the possible combinations of source
* and destination surface pools, and how we handle each of them.
*
* ┌────────────┬───────────────────────────┬───────────┬───────────────────────┬──────────┐
* │ Src/Dst │ DEFAULT │ MANAGED │ SYSTEMMEM │ SCRATCH │
* ├────────────┼───────────────────────────┼───────────┼───────────────────────┼──────────┤
* │ DEFAULT │ StretchRect │ - │ GetRenderTargetData │ - │
* │ MANAGED │ UpdateTextureFromBuffer │ memcpy │ memcpy │ - │
* │ SYSTEMMEM │ UpdateSurface │ memcpy │ memcpy │ - │
* │ SCRATCH │ - │ - │ - │ - │
* └────────────┴───────────────────────────┴───────────┴───────────────────────┴──────────┘
* ┌────────────┬───────────────────────────┬───────────────────────┬───────────────────────┬──────────┐
* │ Src/Dst │ DEFAULT │ MANAGED │ SYSTEMMEM │ SCRATCH │
* ├────────────┼───────────────────────────┼───────────────────────┼───────────────────────┼──────────┤
* │ DEFAULT │ StretchRect │ GetRenderTargetData │ GetRenderTargetData │ - │
* │ MANAGED │ UpdateTextureFromBuffer │ memcpy │ memcpy │ - │
* │ SYSTEMMEM │ UpdateSurface │ memcpy │ memcpy │ - │
* │ SCRATCH │ - │ - │ - │ - │
* └────────────┴───────────────────────────┴───────────────────────┴───────────────────────┴──────────┘
*/
HRESULT STDMETHODCALLTYPE D3D8Device::CopyRects(
IDirect3DSurface8* pSourceSurface,
Expand Down Expand Up @@ -667,8 +667,25 @@ namespace dxvk {
case D3DPOOL_MANAGED:
switch (srcDesc.Pool) {
case D3DPOOL_DEFAULT: {
// TODO: (copy on GPU)
goto unhandled;
// TODO: Copy on GPU (handle MANAGED similarly to SYSTEMMEM for now)

// Get temporary off-screen surface for stretching.
Com<d3d9::IDirect3DSurface9> pBlitImage = dst->GetBlitImage();

// Stretch the source RT to the temporary surface.
res = GetD3D9()->StretchRect(
src->GetD3D9(),
&srcRect,
pBlitImage.ptr(),
&dstRect,
d3d9::D3DTEXF_NONE);
if (FAILED(res)) {
goto done;
}

// Now sync the rendertarget data into main memory.
res = GetD3D9()->GetRenderTargetData(pBlitImage.ptr(), dst->GetD3D9());
goto done;
}
case D3DPOOL_MANAGED:
case D3DPOOL_SYSTEMMEM: {
Expand Down