[PATCH 3/3] evr/presenter: Make GetCurrentImage() work without output window.
Nikolay Sivov
nsivov at codeweavers.com
Wed Apr 6 09:41:59 CDT 2022
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
Used by Secret of Mana game.
dlls/evr/presenter.c | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c
index e70e25a19a7..d8bdbee3915 100644
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -492,27 +492,28 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM
IDirect3DDevice9 *device;
HRESULT hr;
- if (!presenter->swapchain)
- return;
-
if (FAILED(hr = video_presenter_get_sample_surface(sample, &surface)))
{
WARN("Failed to get sample surface, hr %#lx.\n", hr);
return;
}
- if (FAILED(hr = IDirect3DSwapChain9_GetBackBuffer(presenter->swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer)))
+ if (presenter->swapchain)
{
- WARN("Failed to get a backbuffer, hr %#lx.\n", hr);
- IDirect3DSurface9_Release(surface);
- return;
- }
+ if (SUCCEEDED(hr = IDirect3DSwapChain9_GetBackBuffer(presenter->swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer)))
+ {
+ IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device);
+ IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT);
- IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device);
- IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT);
+ IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0);
+ presenter->frame_stats.presented++;
- IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0);
- presenter->frame_stats.presented++;
+ IDirect3DDevice9_Release(device);
+ IDirect3DSurface9_Release(backbuffer);
+ }
+ else
+ WARN("Failed to get a backbuffer, hr %#lx.\n", hr);
+ }
EnterCriticalSection(&presenter->cs);
if (presenter->thread.queue.last_presented)
@@ -521,8 +522,6 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM
IMFSample_AddRef(presenter->thread.queue.last_presented);
LeaveCriticalSection(&presenter->cs);
- IDirect3DDevice9_Release(device);
- IDirect3DSurface9_Release(backbuffer);
IDirect3DSurface9_Release(surface);
}
@@ -1493,13 +1492,13 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon
sample = presenter->thread.queue.last_presented;
presenter->thread.queue.last_presented = NULL;
- if (!presenter->swapchain || !sample)
+ if (!sample)
{
hr = MF_E_INVALIDREQUEST;
}
else if (SUCCEEDED(hr = video_presenter_get_sample_surface(sample, &surface)))
{
- IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device);
+ IDirect3DSurface9_GetDevice(surface, &device);
IDirect3DSurface9_GetDesc(surface, &surface_desc);
if (surface_desc.Format != D3DFMT_X8R8G8B8)
--
2.35.1
More information about the wine-devel
mailing list