marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Print an ERR for unknown / invalid surface locations in surface_load_location().

oldstable
Henri Verbeet 2011-07-04 21:39:39 +02:00 committed by Alexandre Julliard
parent 1c3b691f10
commit 4e8c7f00f2
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/wined3d/surface.c
View File

@ -6213,17 +6213,26 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const
return WINED3DERR_DEVICELOST;
}
if (flag == SFLAG_INSYSMEM)
surface_load_sysmem(surface, gl_info, rect);
else if (flag == SFLAG_INDRAWABLE)
switch (flag)
{
if (FAILED(hr = surface_load_drawable(surface, gl_info, rect)))
return hr;
}
else /* if(flag & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) */
{
if (FAILED(hr = surface_load_texture(surface, gl_info, rect, flag == SFLAG_INSRGBTEX)))
return hr;
case SFLAG_INSYSMEM:
surface_load_sysmem(surface, gl_info, rect);
break;
case SFLAG_INDRAWABLE:
if (FAILED(hr = surface_load_drawable(surface, gl_info, rect)))
return hr;
break;
case SFLAG_INTEXTURE:
case SFLAG_INSRGBTEX:
if (FAILED(hr = surface_load_texture(surface, gl_info, rect, flag == SFLAG_INSRGBTEX)))
return hr;
break;
default:
ERR("Don't know how to handle location %#x.\n", flag);
break;
}
if (!rect)