[PATCH 1/5] wined3d: Simplify the data.buffer_object assignment in surface_load_texture().

Henri Verbeet hverbeet at codeweavers.com
Sun Apr 8 12:13:22 CDT 2012


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);
 
-- 
1.7.3.4




More information about the wine-patches mailing list