Henri Verbeet : wined3d: Simplify the data. buffer_object assignment in surface_load_texture().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Sun Apr  8 19:13:22 2012 +0200

wined3d: Simplify the data.buffer_object assignment in surface_load_texture().

The surface pbo field should be 0 is SFLAG_PBO is not set.

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 98d259c..29035fe 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -6177,7 +6177,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
         mem = surface->resource.allocatedMemory;
     }
 
-    data.buffer_object = surface->flags & SFLAG_PBO ? surface->pbo : 0;
+    data.buffer_object = surface->pbo;
     data.addr = mem;
     surface_upload_data(surface, gl_info, &format, &src_rect, src_pitch, &dst_point, srgb, &data);