Signed-off-by: Jan Sikorski jsikorski@codeweavers.com --- dlls/wined3d/device.c | 5 ++++- dlls/wined3d/surface.c | 3 +++ include/wine/wined3d.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 06329293261..d17d923af08 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4984,6 +4984,7 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, { struct wined3d_texture *dst_texture, *src_texture; unsigned int dst_level, src_level; + struct wined3d_blt_fx fx = {0}; RECT dst_rect, src_rect;
TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, " @@ -5010,6 +5011,8 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, return; }
+ fx.resolve_format_id = format_id; + dst_texture = texture_from_resource(dst_resource); src_texture = texture_from_resource(src_resource);
@@ -5020,7 +5023,7 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, src_level), wined3d_texture_get_level_height(src_texture, src_level)); wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, - src_texture, src_sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + src_texture, src_sub_resource_idx, &src_rect, 0, &fx, WINED3D_TEXF_POINT); }
HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d5d07d8c401..d25516defc8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1479,6 +1479,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ enum wined3d_texture_filter_type filter) { struct wined3d_texture_sub_resource *src_sub_resource, *dst_sub_resource; + enum wined3d_format_id resolve_format_id = WINED3DFMT_UNKNOWN; struct wined3d_device *device = dst_texture->resource.device; struct wined3d_swapchain *src_swapchain, *dst_swapchain; const struct wined3d_color_key *colour_key = NULL; @@ -1509,6 +1510,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("src_color_key {0x%08x, 0x%08x}.\n", fx->src_color_key.color_space_low_value, fx->src_color_key.color_space_high_value); + TRACE("resolve_format_id %s.\n", debug_d3dformat(fx->resolve_format_id)); + resolve_format_id = fx->resolve_format_id; }
dst_sub_resource = &dst_texture->sub_resources[dst_sub_resource_idx]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 030e3fdcb67..29028fa6450 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2007,6 +2007,7 @@ struct wined3d_blt_fx DWORD fx; struct wined3d_color_key dst_color_key; struct wined3d_color_key src_color_key; + enum wined3d_format_id resolve_format_id; };
struct wined3d_buffer_desc