Skip to content

W
wine-cw
Commit c7eb6a75 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

wined3d: Pass a context to surface_multisample_resolve.

Signed-off-by: 's avatarStefan Dösinger <stefan@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a23b395e
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
dlls/wined3d/surface.c
View file @ c7eb6a75
...@@ -4058,19 +4058,17 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, ...@@ -4058,19 +4058,17 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
return WINED3D_OK; return WINED3D_OK;
} }
static void surface_multisample_resolve(struct wined3d_surface *surface) /* Context activation is done by the caller. */
static void surface_multisample_resolve(struct wined3d_surface *surface, struct wined3d_context *context)
{ {
struct wined3d_context *context;
RECT rect = {0, 0, surface->resource.width, surface->resource.height}; RECT rect = {0, 0, surface->resource.width, surface->resource.height};
if (!(surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE)) if (!(surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE))
ERR("Trying to resolve multisampled surface %p, but location WINED3D_LOCATION_RB_MULTISAMPLE not current.\n", ERR("Trying to resolve multisampled surface %p, but location WINED3D_LOCATION_RB_MULTISAMPLE not current.\n",
surface); surface);
context = context_acquire(surface->resource.device, NULL);
surface_blt_fbo(surface->resource.device, context, WINED3D_TEXF_POINT, surface_blt_fbo(surface->resource.device, context, WINED3D_TEXF_POINT,
surface, WINED3D_LOCATION_RB_MULTISAMPLE, &rect, surface, WINED3D_LOCATION_RB_RESOLVED, &rect); surface, WINED3D_LOCATION_RB_MULTISAMPLE, &rect, surface, WINED3D_LOCATION_RB_RESOLVED, &rect);
context_release(context);
} }
HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location)
...@@ -4149,7 +4147,9 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) ...@@ -4149,7 +4147,9 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location)
break; break;
case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_RESOLVED:
surface_multisample_resolve(surface); context = context_acquire(device, NULL);
surface_multisample_resolve(surface, context);
context_release(context);
break; break;
case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_RGB:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment