Zebediah Figura : wined3d: Do not call wined3d_buffer_get_memory() in wined3d_buffer_init_data().
Alexandre Julliard
julliard at winehq.org
Tue Jun 22 16:17:07 CDT 2021
Module: wine
Branch: master
Commit: a48513f114ac048d963c2073d8f5515ea0211356
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a48513f114ac048d963c2073d8f5515ea0211356
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Jun 18 11:13:24 2021 -0500
wined3d: Do not call wined3d_buffer_get_memory() in wined3d_buffer_init_data().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/buffer.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 12d038c0120..6cfeb4f510d 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1041,7 +1041,6 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer,
struct wined3d_device *device, const struct wined3d_sub_resource_data *data)
{
struct wined3d_resource *resource = &buffer->resource;
- struct wined3d_bo_address bo;
struct wined3d_box box;
if (buffer->flags & WINED3D_BUFFER_USE_BO)
@@ -1052,8 +1051,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer,
}
else
{
- wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM);
- memcpy(bo.addr, data->data, resource->size);
+ memcpy(buffer->resource.heap_memory, data->data, resource->size);
wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM);
wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM);
}
More information about the wine-cvs
mailing list