[PATCH 5/6] wined3d: Remove unnecessary src_format NULL check from ffp_blit_supported().
Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0ee2f8266372..4d5b77702086 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1964,7 +1964,7 @@ static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) return FALSE; - decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + decompress = (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 && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) { -- 2.19.2
Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=47450 Your paranoid android. === debian9 (32 bit report) === d3d11: d3d11.c:5593: Test failed: Got unexpected hr 0x8876086a. Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000). === debian9 (32 bit Chinese:China report) === d3d11: d3d11.c:5346: Test failed: Got unexpected hr 0x8876086a for query type 4. d3d11.c:5593: Test failed: Got unexpected hr 0x8876086a. Unhandled exception: page fault on read access to 0x0000001b in 32-bit code (0x7eb5bf72). === debian9 (32 bit WoW report) === d3d11: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000).
participants (3)
-
Henri Verbeet -
Józef Kucia -
Marvin