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

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Mon Nov 18 10:46:20 2013 +0100

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

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 9780a31..7718186 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1498,15 +1498,6 @@ static void surface_unload(struct wined3d_resource *resource)
     list_init(&surface->renderbuffers);
     surface->current_renderbuffer = NULL;

-    /* If we're in a texture, the texture name belongs to the texture.
-     * Otherwise, destroy it. */
-    if (!surface->container)
-    {
-        gl_info->gl_ops.gl.p_glDeleteTextures(1, &surface->texture_name);
-        surface->texture_name = 0;
-        gl_info->gl_ops.gl.p_glDeleteTextures(1, &surface->texture_name_srgb);
-        surface->texture_name_srgb = 0;
-    }
     if (surface->rb_multisample)
     {
         gl_info->fbo_ops.glDeleteRenderbuffers(1, &surface->rb_multisample);