Henri Verbeet : wined3d: Surfaces always have a container in ffp_blit_set() .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ad6a194aa00bcdf1518b1c31748c4229b2b7adb0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ad6a194aa00bcdf1518b1c3174...

Author: Henri Verbeet 
Date:   Wed Nov 20 10:04:30 2013 +0100

wined3d: Surfaces always have a container in ffp_blit_set().

---

dlls/wined3d/surface.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 320a79b..c1714c1 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -5594,14 +5594,8 @@ static void ffp_blit_free(struct wined3d_device *device) { }
 static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface)
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
-    GLenum target;

-    if (surface->container)
-        target = surface->container->target;
-    else
-        target = surface->texture_target;
-
-    gl_info->gl_ops.gl.p_glEnable(target);
+    gl_info->gl_ops.gl.p_glEnable(surface->container->target);
     checkGLcall("glEnable(target)");

return WINED3D_OK;