[PATCH 1/2] wined3d: Handle scale with multisampled destination in texture2d_blt_fbo().
Paul Gofman
gofmanp at gmail.com
Mon Mar 9 05:37:26 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>
---
dlls/d3d9/tests/visual.c | 88 +++++++++++++++++++++++++++++-----------
dlls/wined3d/surface.c | 33 +++++++++++----
2 files changed, 90 insertions(+), 31 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 a67a08042c..6c9f6e46e1 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -147,6 +147,7 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co
const RECT *dst_rect)
{
struct wined3d_texture *required_texture, *restore_texture;
+ DWORD orig_dst_location = dst_location;
const struct wined3d_gl_info *gl_info;
struct wined3d_context_gl *context_gl;
unsigned int restore_idx;
@@ -175,12 +176,17 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co
break;
}
- /* 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;
+ }
/* Make sure the locations are up-to-date. Loading the destination
* surface isn't required if the entire surface is overwritten. (And is
@@ -188,9 +194,14 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co
* the purpose of loading the destination surface.) */
wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location);
if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect))
+ {
wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location);
+ }
else
+ {
wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location);
+ wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location);
+ }
/* Acquire a context for the front-buffer, even though we may be blitting
* to/from a back-buffer. Since context_acquire() doesn't take the
@@ -198,7 +209,7 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co
* offscreen. */
if (src_location == WINED3D_LOCATION_DRAWABLE)
required_texture = src_texture->swapchain->front_buffer;
- else if (dst_location == WINED3D_LOCATION_DRAWABLE)
+ else if (orig_dst_location == WINED3D_LOCATION_DRAWABLE)
required_texture = dst_texture->swapchain->front_buffer;
else
required_texture = NULL;
@@ -240,7 +251,7 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co
checkGLcall("glReadBuffer()");
wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER);
- if (dst_location == WINED3D_LOCATION_DRAWABLE)
+ if (orig_dst_location == WINED3D_LOCATION_DRAWABLE)
{
TRACE("Destination texture %p is onscreen.\n", dst_texture);
buffer = wined3d_texture_get_gl_buffer(dst_texture);
@@ -273,7 +284,13 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co
dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, GL_COLOR_BUFFER_BIT, gl_filter);
checkGLcall("glBlitFramebuffer()");
- if (dst_location == WINED3D_LOCATION_DRAWABLE && dst_texture->swapchain->front_buffer == dst_texture)
+ if (dst_location != orig_dst_location)
+ {
+ wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location);
+ wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, orig_dst_location);
+ }
+
+ if (orig_dst_location == WINED3D_LOCATION_DRAWABLE && dst_texture->swapchain->front_buffer == dst_texture)
gl_info->gl_ops.gl.p_glFlush();
if (restore_texture)
--
2.24.1
More information about the wine-devel
mailing list