Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/wined3d/buffer.c | 9 +++++---- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6cfeb4f510d..267a8a0bd9c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -603,9 +603,10 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; }
-DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, - struct wined3d_bo_address *data, DWORD locations) +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data) { + unsigned int locations = buffer->locations; + TRACE("buffer %p, data %p, locations %s.\n", buffer, data, wined3d_debug_location(locations));
@@ -1005,10 +1006,10 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off TRACE("dst_buffer %p, dst_offset %u, src_buffer %p, src_offset %u, size %u.\n", dst_buffer, dst_offset, src_buffer, src_offset, size);
- dst_location = wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); + dst_location = wined3d_buffer_get_memory(dst_buffer, &dst); dst.addr += dst_offset;
- wined3d_buffer_get_memory(src_buffer, &src, src_buffer->locations); + wined3d_buffer_get_memory(src_buffer, &src); src.addr += src_offset;
context = context_acquire(dst_buffer->resource.device, NULL, 0); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7f50126204b..8b35b9da17f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -304,7 +304,7 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi else { wined3d_buffer_load(buffer, context, state); - wined3d_buffer_get_memory(buffer, &data, buffer->locations); + wined3d_buffer_get_memory(buffer, &data); element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7900df3c246..9baa0ae0cd3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1611,7 +1611,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ if (!view->counter_bo) return;
- dst_location = wined3d_buffer_get_memory(buffer, &dst, buffer->locations); + dst_location = wined3d_buffer_get_memory(buffer, &dst); dst.addr += offset;
src.buffer_object = view->counter_bo; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bbc2f4f4db7..6ada1fa3642 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4899,8 +4899,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; -DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, - struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;