From f5e289c6e00197af268d6a96c584dc6478a2d010 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 17 Jul 2012 11:40:35 +0200 Subject: [PATCH] wined3d: Use the proper texture target in ffp_blit_set(). --- dlls/wined3d/surface.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 21028ba2240..3fa10d12274 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6340,6 +6340,12 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { enum complex_fixup fixup = get_complex_fixup(surface->resource.format->color_fixup); + GLenum target; + + if (surface->container.type == WINED3D_CONTAINER_TEXTURE) + target = surface->container.u.texture->target; + else + target = surface->texture_target; /* When EXT_PALETTED_TEXTURE is around, palette conversion is done by the GPU * else the surface is converted in software at upload time in LoadLocation. @@ -6349,8 +6355,8 @@ static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, co ffp_blit_p8_upload_palette(surface, context->gl_info); ENTER_GL(); - glEnable(surface->texture_target); - checkGLcall("glEnable(surface->texture_target)"); + glEnable(target); + checkGLcall("glEnable(target)"); LEAVE_GL(); return WINED3D_OK; } -- 2.11.4.GIT