From cd0c18f56b420b44017e839f6fd8f14c945105d0 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Sun, 8 Apr 2012 19:13:22 +0200
Subject: [PATCH] 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 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 98d259c064b..29035feec8b 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);
 
-- 
2.11.4.GIT