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

wined3d: Pass a context to surface_load_sysmem. 

Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Stefan Dösinger 2015-10-12 22:34:38 +02:00 committed by Alexandre Julliard
parent 2a51e695a1
commit a385c9ea3e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/wined3d/surface.c
View File

@ -3797,9 +3797,12 @@ static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD
memcpy(dst.addr, src.addr, size); memcpy(dst.addr, src.addr, size);
} }
/* Context activation is done by the caller. */
static void surface_load_sysmem(struct wined3d_surface *surface, static void surface_load_sysmem(struct wined3d_surface *surface,
const struct wined3d_gl_info *gl_info, DWORD dst_location) struct wined3d_context *context, DWORD dst_location)
{ {
const struct wined3d_gl_info *gl_info = context->gl_info;
if (surface->locations & surface_simple_locations) if (surface->locations & surface_simple_locations)
{ {
surface_copy_simple_location(surface, dst_location); surface_copy_simple_location(surface, dst_location);
@ -3812,18 +3815,10 @@ static void surface_load_sysmem(struct wined3d_surface *surface,
/* Download the surface to system memory. */ /* Download the surface to system memory. */
if (surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) if (surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB))
{ {
struct wined3d_device *device = surface->resource.device;
struct wined3d_context *context;
/* TODO: Use already acquired context when possible. */
context = context_acquire(device, NULL);
wined3d_texture_bind_and_dirtify(surface->container, context, wined3d_texture_bind_and_dirtify(surface->container, context,
!(surface->locations & WINED3D_LOCATION_TEXTURE_RGB)); !(surface->locations & WINED3D_LOCATION_TEXTURE_RGB));
surface_download_data(surface, gl_info, dst_location); surface_download_data(surface, gl_info, dst_location);
context_release(context);
return; return;
} }
@ -4046,6 +4041,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location)
struct wined3d_device *device = surface->resource.device; struct wined3d_device *device = surface->resource.device;
const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
HRESULT hr; HRESULT hr;
struct wined3d_context *context = NULL;
TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location));
@ -4054,7 +4050,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location)
if (location == WINED3D_LOCATION_TEXTURE_RGB if (location == WINED3D_LOCATION_TEXTURE_RGB
&& surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED)) && surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED))
{ {
struct wined3d_context *context = context_acquire(device, NULL); context = context_acquire(device, NULL);
surface_load_ds_location(surface, context, location); surface_load_ds_location(surface, context, location);
context_release(context); context_release(context);
return WINED3D_OK; return WINED3D_OK;
@ -4100,7 +4096,11 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location)
case WINED3D_LOCATION_USER_MEMORY: case WINED3D_LOCATION_USER_MEMORY:
case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_SYSMEM:
case WINED3D_LOCATION_BUFFER: case WINED3D_LOCATION_BUFFER:
surface_load_sysmem(surface, gl_info, location); if (device->d3d_initialized)
context = context_acquire(device, NULL);
surface_load_sysmem(surface, context, location);
if (context)
context_release(context);
break; break;
case WINED3D_LOCATION_DRAWABLE: case WINED3D_LOCATION_DRAWABLE: