diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-12-21 06:30:39 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-21 06:30:39 +1000 |
| commit | e52ebd6e8587e2e37ed65ad9fc9035c2bd00b563 (patch) | |
| tree | 8dc271c2fdc6ceda6b329762d234c88e0fdffe2e /src/mesa/state_tracker/st_cb_bufferobjects.c | |
| parent | 9f2cf899578464a7448d7abec681bde42eb3d2f2 (diff) | |
| parent | 5c102dd94f435e97507213fbd128e50dd15f5f54 (diff) | |
Merge remote branch 'origin/master' into nvc0-new
Conflicts:
src/gallium/drivers/nouveau/nouveau_winsys.h
Diffstat (limited to 'src/mesa/state_tracker/st_cb_bufferobjects.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_bufferobjects.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c index 8b60f9040d..d4d9af4ada 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.c +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c @@ -360,7 +360,7 @@ st_bufferobj_unmap(struct gl_context *ctx, GLenum target, struct gl_buffer_objec struct st_buffer_object *st_obj = st_buffer_object(obj); if (obj->Length) - pipe_buffer_unmap(pipe, st_obj->buffer, st_obj->transfer); + pipe_buffer_unmap(pipe, st_obj->transfer); st_obj->transfer = NULL; obj->Pointer = NULL; @@ -409,8 +409,8 @@ st_copy_buffer_subdata(struct gl_context *ctx, if (srcPtr && dstPtr) memcpy(dstPtr + writeOffset, srcPtr + readOffset, size); - pipe_buffer_unmap(pipe, srcObj->buffer, src_transfer); - pipe_buffer_unmap(pipe, dstObj->buffer, dst_transfer); + pipe_buffer_unmap(pipe, src_transfer); + pipe_buffer_unmap(pipe, dst_transfer); } |