[PATCH 3/5] wined3d: Surfaces always have a container in arbfp_blit_set().

Henri Verbeet hverbeet at codeweavers.com
Wed Nov 20 03:04:31 CST 2013


---
 dlls/wined3d/arb_program_shader.c |    7 +------
 1 file changed, 1 insertion(+), 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)
     {
-- 
1.7.10.4




More information about the wine-patches mailing list