Józef Kucia : wined3d: Call GL functions through gl_info.gl_ops in ffp_blit_blit_surface().
Module: wine Branch: master Commit: 26a9c3a4e67c8bdcea58ad8068c0d5046f60d44c URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a9c3a4e67c8bdcea58ad8068... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 10 10:22:34 2016 +0200 wined3d: Call GL functions through gl_info.gl_ops in ffp_blit_blit_surface(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 522874b..d44d0ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3266,6 +3266,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; /* Blit from offscreen surface to render target */ @@ -3277,15 +3278,16 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, color_key); context = context_acquire(device, dst_surface); + gl_info = context->gl_info; if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) - glEnable(GL_ALPHA_TEST); + gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); surface_blt_to_drawable(device, context, filter, !!color_key, src_surface, src_rect, dst_surface, dst_rect); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) - glDisable(GL_ALPHA_TEST); + gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); context_release(context);
participants (1)
-
Alexandre Julliard