Skip to content

W
wine-winehq
Commit 7ec7d812 authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard
Browse files
Options

wined3d: Handle scale with multisampled blit destination in texture2d_blt().

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: 's avatarPaul Gofman <gofmanp@gmail.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ed93bf49
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 26 deletions
dlls/d3d9/tests/visual.c
View file @ 7ec7d812
...@@ -4332,7 +4332,7 @@ static void test_multisample_stretch_rect(void) ...@@ -4332,7 +4332,7 @@ static void test_multisample_stretch_rect(void)
D3DTEXF_POINT, D3DTEXF_POINT,
D3DTEXF_LINEAR, D3DTEXF_LINEAR,
}; };
IDirect3DSurface9 *rt, *ms_rt, *rt_r5g6b5; IDirect3DSurface9 *rt, *ms_rt, *ms_rt2, *rt_r5g6b5;
struct surface_readback rb; struct surface_readback rb;
IDirect3DDevice9 *device; IDirect3DDevice9 *device;
DWORD quality_levels; DWORD quality_levels;
...@@ -4367,27 +4367,30 @@ static void test_multisample_stretch_rect(void) ...@@ -4367,27 +4367,30 @@ static void test_multisample_stretch_rect(void)
hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128,
D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); 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, hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128,
D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, quality_levels - 1, FALSE, &ms_rt, NULL); 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); 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); 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); 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) for (i = 0; i < ARRAY_SIZE(filters); ++i)
{ {
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); 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]); 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); 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 */ /* Scaling */
...@@ -4395,29 +4398,67 @@ static void test_multisample_stretch_rect(void) ...@@ -4395,29 +4398,67 @@ static void test_multisample_stretch_rect(void)
for (i = 0; i < ARRAY_SIZE(filters); ++i) for (i = 0; i < ARRAY_SIZE(filters); ++i)
{ {
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); 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]); 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); get_rt_readback(rt, &rb);
color = get_readback_color(&rb, 32, 32); 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); 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); 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); 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); 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]); 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); get_rt_readback(rt, &rb);
color = get_readback_color(&rb, 32, 32); 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); 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); 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); release_surface_readback(&rb);
} }
...@@ -4433,18 +4474,19 @@ static void test_multisample_stretch_rect(void) ...@@ -4433,18 +4474,19 @@ static void test_multisample_stretch_rect(void)
for (i = 0; i < ARRAY_SIZE(filters); ++i) for (i = 0; i < ARRAY_SIZE(filters); ++i)
{ {
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); 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]); 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]); 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); 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); IDirect3DSurface9_Release(rt_r5g6b5);
done: done:
IDirect3DSurface9_Release(ms_rt2);
IDirect3DSurface9_Release(ms_rt); IDirect3DSurface9_Release(ms_rt);
IDirect3DSurface9_Release(rt); IDirect3DSurface9_Release(rt);
refcount = IDirect3DDevice9_Release(device); refcount = IDirect3DDevice9_Release(device);
dlls/wined3d/surface.c
View file @ 7ec7d812
...@@ -2612,10 +2612,13 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ ...@@ -2612,10 +2612,13 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_
else else
src_location = src_texture->resource.draw_binding; src_location = src_texture->resource.draw_binding;
if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU))
dst_location = dst_texture->resource.draw_binding;
else
dst_location = dst_texture->resource.map_binding; dst_location = dst_texture->resource.map_binding;
else if (dst_texture->resource.multisample_type != WINED3D_MULTISAMPLE_NONE
&& (scale || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT))
dst_location = WINED3D_LOCATION_RB_RESOLVED;
else
dst_location = dst_texture->resource.draw_binding;
context = context_acquire(device, dst_texture, dst_sub_resource_idx); context = context_acquire(device, dst_texture, dst_sub_resource_idx);
valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context, valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment