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

a1b8f254 · Henri Verbeet · Alexandre Julliard · 9f3e6a20 · a1b8f254
Commit a1b8f254 authored Jun 09, 2011 by Henri Verbeet Committed by Alexandre Julliard Jun 10, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

surface.c dlls/wined3d/surface.c +1 -2

No files found.
--- 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);