Module: wine Branch: master Commit: c7eb6a75344dc3c602d627a1c0366482ed14936d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7eb6a75344dc3c602d627a1c0...
Author: Stefan Dösinger stefan@codeweavers.com Date: Thu Oct 15 22:41:09 2015 +0200
wined3d: Pass a context to surface_multisample_resolve.
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
---
dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 994e161..eb88b59 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4058,19 +4058,17 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, 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};
if (!(surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE)) ERR("Trying to resolve multisampled surface %p, but location WINED3D_LOCATION_RB_MULTISAMPLE not current.\n", surface);
- context = context_acquire(surface->resource.device, NULL); surface_blt_fbo(surface->resource.device, context, WINED3D_TEXF_POINT, 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) @@ -4149,7 +4147,9 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) break;
case WINED3D_LOCATION_RB_RESOLVED: - surface_multisample_resolve(surface); + context = context_acquire(device, NULL); + surface_multisample_resolve(surface, context); + context_release(context); break;
case WINED3D_LOCATION_TEXTURE_RGB: