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

wined3d: Support getdc with user memory.

This commit is contained in:
Stefan Dösinger 2013-12-11 12:22:16 +01:00 committed by Alexandre Julliard
parent a88a121059
commit 9b67b1b8a1
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/wined3d/surface.c
View File

@ -3309,12 +3309,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc)
TRACE("surface %p, dc %p.\n", surface, dc); TRACE("surface %p, dc %p.\n", surface, dc);
if (surface->flags & SFLAG_USERPTR)
{
ERR("Not supported on surfaces with application-provided memory.\n");
return WINEDDERR_NODC;
}
/* Give more detailed info for ddraw. */ /* Give more detailed info for ddraw. */
if (surface->flags & SFLAG_DCINUSE) if (surface->flags & SFLAG_DCINUSE)
return WINEDDERR_DCALREADYCREATED; return WINEDDERR_DCALREADYCREATED;
@ -3335,8 +3329,8 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc)
if (FAILED(hr)) if (FAILED(hr))
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
/* Use the DIB section from now on if we are not using a PBO. */ /* Use the DIB section from now on if we are not using a PBO or user memory. */
if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM | SFLAG_USERPTR)))
{ {
wined3d_resource_free_sysmem(&surface->resource); wined3d_resource_free_sysmem(&surface->resource);
surface->resource.allocatedMemory = surface->dib.bitmap_data; surface->resource.allocatedMemory = surface->dib.bitmap_data;