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

wined3d: Pass a context to surface_blt_to_drawable. 

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:40 +02:00 committed by Alexandre Julliard
parent b28511f73b
commit 7af0ede8fe
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/wined3d/surface.c
View File

@ -3275,19 +3275,28 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW
rect->bottom = drawable_height - rect->bottom; rect->bottom = drawable_height - rect->bottom;
} }
/* Context activation is done by the caller. */
static void surface_blt_to_drawable(const struct wined3d_device *device, static void surface_blt_to_drawable(const struct wined3d_device *device,
struct wined3d_context *old_ctx,
enum wined3d_texture_filter_type filter, BOOL alpha_test, enum wined3d_texture_filter_type filter, BOOL alpha_test,
struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *src_surface, const RECT *src_rect_in,
struct wined3d_surface *dst_surface, const RECT *dst_rect_in) struct wined3d_surface *dst_surface, const RECT *dst_rect_in)
{ {
const struct wined3d_gl_info *gl_info; const struct wined3d_gl_info *gl_info;
struct wined3d_context *context; struct wined3d_context *context = old_ctx;
struct wined3d_surface *restore_rt = NULL;
RECT src_rect, dst_rect; RECT src_rect, dst_rect;
src_rect = *src_rect_in; src_rect = *src_rect_in;
dst_rect = *dst_rect_in; dst_rect = *dst_rect_in;
context = context_acquire(device, dst_surface);
if (old_ctx->current_rt != dst_surface)
{
restore_rt = old_ctx->current_rt;
context = context_acquire(device, dst_surface);
}
gl_info = context->gl_info; gl_info = context->gl_info;
/* Make sure the surface is up-to-date. This should probably use /* Make sure the surface is up-to-date. This should probably use
@ -3340,7 +3349,8 @@ static void surface_blt_to_drawable(const struct wined3d_device *device,
&& dst_surface->container->swapchain->front_buffer == dst_surface->container)) && dst_surface->container->swapchain->front_buffer == dst_surface->container))
gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
context_release(context); if (restore_rt)
context_restore(context, restore_rt);
} }
HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color)
@ -3844,6 +3854,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface,
const struct wined3d_gl_info *gl_info) const struct wined3d_gl_info *gl_info)
{ {
RECT r; RECT r;
struct wined3d_context *context;
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO if (wined3d_settings.offscreen_rendering_mode == ORM_FBO
&& wined3d_resource_is_offscreen(&surface->container->resource)) && wined3d_resource_is_offscreen(&surface->container->resource))
@ -3852,10 +3863,12 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface,
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
context = context_acquire(surface->resource.device, surface);
surface_get_rect(surface, NULL, &r); surface_get_rect(surface, NULL, &r);
surface_load_location(surface, WINED3D_LOCATION_TEXTURE_RGB); surface_load_location(surface, WINED3D_LOCATION_TEXTURE_RGB);
surface_blt_to_drawable(surface->resource.device, surface_blt_to_drawable(surface->resource.device, context,
WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r);
context_release(context);
return WINED3D_OK; return WINED3D_OK;
} }
@ -4286,6 +4299,8 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter,
struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect,
const struct wined3d_color_key *color_key) const struct wined3d_color_key *color_key)
{ {
struct wined3d_context *context;
/* Blit from offscreen surface to render target */ /* Blit from offscreen surface to render target */
struct wined3d_color_key old_blt_key = src_surface->container->async.src_blt_color_key; struct wined3d_color_key old_blt_key = src_surface->container->async.src_blt_color_key;
DWORD old_color_key_flags = src_surface->container->async.color_key_flags; DWORD old_color_key_flags = src_surface->container->async.color_key_flags;
@ -4294,8 +4309,10 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter,
wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, color_key); wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, color_key);
surface_blt_to_drawable(device, filter, context = context_acquire(device, dst_surface);
surface_blt_to_drawable(device, context, filter,
!!color_key, src_surface, src_rect, dst_surface, dst_rect); !!color_key, src_surface, src_rect, dst_surface, dst_rect);
context_release(context);
/* Restore the color key parameters */ /* Restore the color key parameters */
wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT,