From f576e5c02857a506e63c33e3303e2a0a4bc24e1a Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 8 Feb 2017 16:46:34 +0100 Subject: [PATCH] wined3d: Allow decompression blits on system memory resources in arbfp_blit_supported(). In general we prefer to do blits between system memory resources on the CPU, but decompressing DXTn formats in particular is problematic. Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/wined3d/arb_program_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f9906b24bfe..85ed462c78d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7713,6 +7713,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { enum complex_fixup src_fixup; + BOOL decompress; if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; @@ -7735,7 +7736,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, return FALSE; } - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); + if (!decompress && (dst_pool == WINED3D_POOL_SYSTEM_MEM || src_pool == WINED3D_POOL_SYSTEM_MEM)) return FALSE; src_fixup = get_complex_fixup(src_format->color_fixup);