ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Check for GPU access before attempting an upload blit in texture2d_blt(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2020-06-02 03:47:01 +04:30 committed by Alexandre Julliard
parent 17a1391fb6
commit 42a909b4f9
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/wined3d/surface.c
View File

@ -1537,12 +1537,6 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_
flags &= ~(WINED3D_BLT_SYNCHRONOUS | WINED3D_BLT_DO_NOT_WAIT | WINED3D_BLT_WAIT); flags &= ~(WINED3D_BLT_SYNCHRONOUS | WINED3D_BLT_DO_NOT_WAIT | WINED3D_BLT_WAIT);
if (!device->d3d_initialized)
{
WARN("D3D not initialized, using CPU blit fallback.\n");
goto cpu;
}
if (flags & ~simple_blit) if (flags & ~simple_blit)
{ {
WARN_(d3d_perf)("Using CPU fallback for complex blit (%#x).\n", flags); WARN_(d3d_perf)("Using CPU fallback for complex blit (%#x).\n", flags);
@ -1629,7 +1623,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_
blit_op = WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST; blit_op = WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST;
} }
else if ((src_sub_resource->locations & surface_simple_locations) else if ((src_sub_resource->locations & surface_simple_locations)
&& !(dst_sub_resource->locations & surface_simple_locations)) && !(dst_sub_resource->locations & surface_simple_locations)
&& (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU))
{ {
/* Upload */ /* Upload */
if (scale) if (scale)