Module: wine Branch: master Commit: e64b19387b2fa37fe2eeabbd76eeaf34af78d7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64b19387b2fa37fe2eeabbd76...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Nov 20 10:04:31 2013 +0100
wined3d: Surfaces always have a container in arbfp_blit_set().
---
dlls/wined3d/arb_program_shader.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5efb562..aa62bfe 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7302,12 +7302,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum textype; - - if (surface->container) - textype = surface->container->target; - else - textype = surface->texture_target; + GLenum textype = surface->container->target;
if (surface->flags & SFLAG_CONVERTED) {