Stefan Dösinger : wined3d: Call buffer_get_memory in surface_load_pbo.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Wed Dec 11 12:22:20 2013 +0100

wined3d: Call buffer_get_memory in surface_load_pbo.

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c65d7c1..0c3df16 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -549,6 +549,8 @@ static void surface_load_pbo(struct wined3d_surface *surface, const struct wined
 {
     struct wined3d_context *context;
     GLenum error;
+    struct wined3d_bo_address data;
+    surface_get_memory(surface, &data);

context = context_acquire(surface->resource.device, NULL);

@@ -563,7 +565,7 @@ static void surface_load_pbo(struct wined3d_surface *surface, const struct wined
     checkGLcall("glBindBufferARB");

GL_EXTCALL(glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->resource.size + 4,
-            surface->resource.allocatedMemory, GL_STREAM_DRAW_ARB));
+            data.addr, GL_STREAM_DRAW_ARB));
     checkGLcall("glBufferDataARB");

GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0));