[v2 PATCH 2/3] wined3d: Handle scale with multisampled destination in fbo_blitter_blit().
Paul Gofman
gofmanp at gmail.com
Mon Mar 9 10:14:34 CDT 2020
If either source or destination is multisampled scaled FBO blit results
in GL_INVALID_OPERATION.
Fixes black screen in 'BlazBlue Calamity Trigger'.
Signed-off-by: Paul Gofman <gofmanp at gmail.com>
---
v2:
- handle resolve in fbo_blitter_blit().
dlls/d3d9/tests/visual.c | 88 +++++++++++++++++++++++++++++-----------
dlls/wined3d/surface.c | 15 ++++---
2 files changed, 75 insertions(+), 28 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 62c053b212..0e71e23018 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -4332,7 +4332,7 @@ static void test_multisample_stretch_rect(void)
D3DTEXF_POINT,
D3DTEXF_LINEAR,
};
- IDirect3DSurface9 *rt, *ms_rt, *rt_r5g6b5;
+ IDirect3DSurface9 *rt, *ms_rt, *ms_rt2, *rt_r5g6b5;
struct surface_readback rb;
IDirect3DDevice9 *device;
DWORD quality_levels;
@@ -4367,27 +4367,30 @@ static void test_multisample_stretch_rect(void)
hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128,
D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL);
- ok(hr == S_OK, "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128,
D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, quality_levels - 1, FALSE, &ms_rt, NULL);
- ok(hr == S_OK, "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128,
+ D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, quality_levels - 1, FALSE, &ms_rt2, NULL);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderTarget(device, 0, ms_rt);
- ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0);
- ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt);
- ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
for (i = 0; i < ARRAY_SIZE(filters); ++i)
{
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0);
- ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, filters[i]);
- ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
color = getPixelColor(device, 64, 64);
- ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color);
+ ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color);
}
/* Scaling */
@@ -4395,29 +4398,67 @@ static void test_multisample_stretch_rect(void)
for (i = 0; i < ARRAY_SIZE(filters); ++i)
{
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0);
- ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
+ hr = IDirect3DDevice9_StretchRect(device, rt, NULL, ms_rt2, NULL, D3DTEXF_NONE);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
+
hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, &rect, filters[i]);
- ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
+ get_rt_readback(rt, &rb);
+ color = get_readback_color(&rb, 32, 32);
+ ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color);
+ color = get_readback_color(&rb, 64, 64);
+ ok(color == 0xffffffff, "Test %u, got unexpected color 0x%08x.\n", i, color);
+ color = get_readback_color(&rb, 96, 96);
+ ok(color == 0xffffffff, "Test %u, got unexpected color 0x%08x.\n", i, color);
+ release_surface_readback(&rb);
+
+ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
+ hr = IDirect3DDevice9_StretchRect(device, ms_rt, &rect, rt, NULL, filters[i]);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
get_rt_readback(rt, &rb);
color = get_readback_color(&rb, 32, 32);
- ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color);
+ ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color);
color = get_readback_color(&rb, 64, 64);
- ok(color == 0xffffffff, "Test %u: Got color 0x%08x.\n", i, color);
+ ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color);
color = get_readback_color(&rb, 96, 96);
- ok(color == 0xffffffff, "Test %u: Got color 0x%08x.\n", i, color);
+ ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color);
release_surface_readback(&rb);
+ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 0.0f, 0);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
+ hr = IDirect3DDevice9_StretchRect(device, rt, NULL, ms_rt, &rect, filters[i]);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0);
- ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
hr = IDirect3DDevice9_StretchRect(device, ms_rt, &rect, rt, NULL, filters[i]);
- ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
+ get_rt_readback(rt, &rb);
+ color = get_readback_color(&rb, 32, 32);
+ ok(color == 0xffffff00, "Test %u, got unexpected color 0x%08x.\n", i, color);
+ color = get_readback_color(&rb, 64, 64);
+ ok(color == 0xffffff00, "Test %u, got unexpected color 0x%08x.\n", i, color);
+ color = get_readback_color(&rb, 96, 96);
+ ok(color == 0xffffff00, "Test %u, got unexpected color 0x%08x.\n", i, color);
+ release_surface_readback(&rb);
+
+ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
+ hr = IDirect3DDevice9_StretchRect(device, rt, NULL, ms_rt, NULL, D3DTEXF_NONE);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
+
+ hr = IDirect3DDevice9_StretchRect(device, ms_rt, &rect, ms_rt2, NULL, filters[i]);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
+ hr = IDirect3DDevice9_StretchRect(device, ms_rt2, &rect, rt, NULL, filters[i]);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
get_rt_readback(rt, &rb);
color = get_readback_color(&rb, 32, 32);
- ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color);
+ ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color);
color = get_readback_color(&rb, 64, 64);
- ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color);
+ ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color);
color = get_readback_color(&rb, 96, 96);
- ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color);
+ ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color);
release_surface_readback(&rb);
}
@@ -4433,18 +4474,19 @@ static void test_multisample_stretch_rect(void)
for (i = 0; i < ARRAY_SIZE(filters); ++i)
{
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0);
- ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt_r5g6b5, NULL, filters[i]);
- ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
hr = IDirect3DDevice9_StretchRect(device, rt_r5g6b5, NULL, rt, NULL, filters[i]);
- ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr);
+ ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
color = getPixelColor(device, 64, 64);
- ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color);
+ ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color);
}
IDirect3DSurface9_Release(rt_r5g6b5);
done:
+ IDirect3DSurface9_Release(ms_rt2);
IDirect3DSurface9_Release(ms_rt);
IDirect3DSurface9_Release(rt);
refcount = IDirect3DDevice9_Release(device);
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index d2552bbd69..1e47f47841 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -938,12 +938,17 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit
{
TRACE("Colour blit.\n");
- /* Resolve the source surface first if needed. */
- if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), src_location)
- && (src_texture->resource.format->id != dst_texture->resource.format->id
+ /* Resolve the source and destination surfaces if needed. */
+ if (src_texture->resource.format->id != dst_texture->resource.format->id
|| abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top)
- || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left)))
- src_location = WINED3D_LOCATION_RB_RESOLVED;
+ || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left))
+ {
+ if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(dst_texture), dst_location))
+ dst_location = WINED3D_LOCATION_RB_RESOLVED;
+
+ if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), src_location))
+ src_location = WINED3D_LOCATION_RB_RESOLVED;
+ }
texture2d_blt_fbo(device, context, filter, src_texture, src_sub_resource_idx, src_location,
src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect);
--
2.24.1
More information about the wine-devel
mailing list