[PATCH 1/2] wined3d: Allocate a heap memory buffer in wined3d_cs_prepare_upload_bo() if possible.
Zebediah Figura
zfigura at codeweavers.com
Thu Feb 24 20:22:17 CST 2022
Based on patches by Matteo Bruni and Michael Müller.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
dlls/wined3d/cs.c | 30 ++++++++++++++++++++++++++++++
dlls/wined3d/wined3d_private.h | 1 +
2 files changed, 31 insertions(+)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index f0328f82794..827b7fbdc0b 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -2755,6 +2755,14 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi
context_release(context);
wined3d_resource_release(resource);
+
+ if (op->bo.flags & UPLOAD_BO_FREE_ON_UNMAP)
+ {
+ if (op->bo.addr.buffer_object)
+ FIXME("Free BO address %s.\n", debug_const_bo_address(&op->bo.addr));
+ else
+ heap_free((void *)op->bo.addr.addr);
+ }
}
void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context,
@@ -3186,6 +3194,28 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str
return true;
}
+ if (!(flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)))
+ {
+ struct wined3d_client_resource *client = &resource->client;
+ const struct wined3d_format *format = resource->format;
+ size_t size;
+
+ wined3d_format_calculate_pitch(format, 1, box->right - box->left,
+ box->bottom - box->top, &map_desc->row_pitch, &map_desc->slice_pitch);
+
+ size = (box->back - box->front - 1) * map_desc->slice_pitch
+ + ((box->bottom - box->top - 1) / format->block_height) * map_desc->row_pitch
+ + ((box->right - box->left + format->block_width - 1) / format->block_width) * format->block_byte_count;
+
+ if (!(map_desc->data = heap_alloc(size)))
+ return false;
+ client->mapped_upload.addr.buffer_object = 0;
+ client->mapped_upload.addr.addr = map_desc->data;
+ client->mapped_upload.flags = UPLOAD_BO_UPLOAD_ON_UNMAP | UPLOAD_BO_FREE_ON_UNMAP;
+ client->mapped_box = *box;
+ return true;
+ }
+
return false;
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index a9837911ea6..a9a71b44a0e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3382,6 +3382,7 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info,
#define UPLOAD_BO_UPLOAD_ON_UNMAP 0x1
#define UPLOAD_BO_RENAME_ON_UNMAP 0x2
+#define UPLOAD_BO_FREE_ON_UNMAP 0x4
struct upload_bo
{
--
2.35.1
More information about the wine-devel
mailing list