From b2a969ceae1d27d4c6afc88dfba62197cfe81ad9 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 8 Apr 2021 23:45:07 -0500 Subject: [PATCH] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_clear_unordered_access_view_uint(). Signed-off-by: Zebediah Figura Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a0b462b714a..3e74f868e58 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2594,19 +2594,19 @@ static void wined3d_cs_exec_clear_unordered_access_view(struct wined3d_cs *cs, c wined3d_resource_release(view->resource); } -void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, +void wined3d_device_context_emit_clear_uav_uint(struct wined3d_device_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { struct wined3d_cs_clear_unordered_access_view *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW; op->view = view; op->clear_value = *clear_value; wined3d_resource_acquire(view->resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7051f3749a3..6df68100356 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5247,7 +5247,7 @@ void CDECL wined3d_device_clear_unordered_access_view_uint(struct wined3d_device { TRACE("device %p, view %p, clear_value %s.\n", device, view, debug_uvec4(clear_value)); - wined3d_cs_emit_clear_unordered_access_view_uint(device->cs, view, clear_value); + wined3d_device_context_emit_clear_uav_uint(&device->cs->c, view, clear_value); } struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc541a654e6..f00ef681215 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4725,7 +4725,7 @@ void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, struct wined3d_texture *texture, unsigned int layer) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; -void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, +void wined3d_device_context_emit_clear_uav_uint(struct wined3d_device_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN;