Henri Verbeet : wined3d: Get rid of a NULL check for surface_upload_data().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Jun  9 20:40:48 2011 +0200

wined3d: Get rid of a NULL check for surface_upload_data().

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 06f38b0..25b99fd 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -6165,8 +6165,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const
                 mem = surface->resource.allocatedMemory;
             }

-            if (mem || (surface->flags & SFLAG_PBO))
-                surface_upload_data(surface, gl_info, &format, srgb, mem);
+            surface_upload_data(surface, gl_info, &format, srgb, mem);

if (context) context_release(context);