wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Jan Sikorski : wined3d: Handle different slice pitches in compressed texture updates.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: e42f89b5430899496852cb13eaaadea6f32ed998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e42f89b5430899496852cb13… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 26 14:21:47 2021 +0100 wined3d: Handle different slice pitches in compressed texture updates. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 22bd8cc34b7..4db62b198eb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2169,43 +2169,44 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format GL_EXTCALL(glCompressedTexSubImage1D(target, level, dst_x, update_w, internal, dst_row_pitch, addr)); } - else if (dst_row_pitch == src_row_pitch) + else { - if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + unsigned int row, y, slice, slice_count = 1, row_count = 1; + + /* glCompressedTexSubImage2D() ignores pixel store state, so we + * can't use the unpack row length like for glTexSubImage2D. */ + if (dst_row_pitch != src_row_pitch) { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, dst_z, - update_w, update_h, update_d, internal, dst_slice_pitch * update_d, addr)); + row_count = (update_h + src_format->block_height - 1) / src_format->block_height; + update_h = src_format->block_height; + wined3d_format_calculate_pitch(src_format, 1, update_w, update_h, + &dst_row_pitch, &dst_slice_pitch); } - else + + if (dst_slice_pitch != src_slice_pitch) { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, dst_y, - update_w, update_h, internal, dst_slice_pitch, addr)); + slice_count = update_d; + update_d = 1; } - } - else - { - unsigned int row_count = (update_h + src_format->block_height - 1) / src_format->block_height; - unsigned int row, y, z; - /* glCompressedTexSubImage2D() ignores pixel store state, so we - * can't use the unpack row length like for glTexSubImage2D. */ - for (z = dst_z; z < dst_z + update_d; ++z) + for (slice = 0; slice < slice_count; ++slice) { for (row = 0, y = dst_y; row < row_count; ++row) { + const BYTE *upload_addr = &addr[slice * src_slice_pitch + row * src_row_pitch]; + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, z, - update_w, src_format->block_height, 1, internal, dst_row_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, dst_z + slice, update_w, + update_h, update_d, internal, update_d * dst_slice_pitch, upload_addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, - update_w, src_format->block_height, internal, dst_row_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, update_w, + update_h, internal, dst_slice_pitch, upload_addr)); } y += src_format->block_height; - addr += src_row_pitch; } } }

1 0

Jan Sikorski : wined3d: Handle different slice pitches in uncompressed texture updates.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: fc29f2a6767005eed7686a1f312a1a0d8aecba16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc29f2a6767005eed7686a1f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 26 14:21:46 2021 +0100 wined3d: Handle different slice pitches in uncompressed texture updates. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 72 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 752b6b4cf9b..22bd8cc34b7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2137,10 +2137,10 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format, GLenum target, - unsigned int level, unsigned int src_row_pitch, unsigned int dst_x, unsigned int dst_y, - unsigned int dst_z, unsigned int update_w, unsigned int update_h, unsigned int update_d, - const BYTE *addr, BOOL srgb, struct wined3d_texture *dst_texture, - const struct wined3d_gl_info *gl_info) + unsigned int level, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, unsigned int update_w, + unsigned int update_h, unsigned int update_d, const BYTE *addr, BOOL srgb, + struct wined3d_texture *dst_texture, const struct wined3d_gl_info *gl_info) { const struct wined3d_format_gl *format_gl = wined3d_format_gl(src_format); @@ -2213,17 +2213,19 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format } else { - unsigned int y, y_count; + unsigned int y, y_count, z, z_count; + bool unpacking_rows = false; TRACE("Uploading data, target %#x, level %u, x %u, y %u, z %u, " "w %u, h %u, d %u, format %#x, type %#x, addr %p.\n", target, level, dst_x, dst_y, dst_z, update_w, update_h, update_d, format_gl->format, format_gl->type, addr); - if (src_row_pitch) + if (src_row_pitch && !(src_row_pitch % src_format->byte_count)) { gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / src_format->byte_count); y_count = 1; + unpacking_rows = true; } else { @@ -2231,25 +2233,47 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format update_h = 1; } - for (y = 0; y < y_count; ++y) + if (src_slice_pitch && unpacking_rows && !(src_slice_pitch % src_row_pitch)) { - if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) - { - GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z, - update_w, update_h, update_d, format_gl->format, format_gl->type, addr)); - } - else if (target == GL_TEXTURE_1D) - { - gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, - update_w, format_gl->format, format_gl->type, addr); - } - else + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, src_slice_pitch / src_row_pitch); + z_count = 1; + } + else if (src_slice_pitch && !unpacking_rows && !(src_slice_pitch % (update_w * src_format->byte_count))) + { + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, + src_slice_pitch / (update_w * src_format->byte_count)); + z_count = 1; + } + else + { + z_count = update_d; + update_d = 1; + } + + for (z = 0; z < z_count; ++z) + { + for (y = 0; y < y_count; ++y) { - gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, - update_w, update_h, format_gl->format, format_gl->type, addr); + const BYTE *upload_addr = &addr[z * src_slice_pitch + y * src_row_pitch]; + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + { + GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z + z, update_w, + update_h, update_d, format_gl->format, format_gl->type, upload_addr)); + } + else if (target == GL_TEXTURE_1D) + { + gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, + update_w, format_gl->format, format_gl->type, upload_addr); + } + else + { + gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, + update_w, update_h, format_gl->format, format_gl->type, upload_addr); + } } } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0); checkGLcall("Upload texture data"); } } @@ -2462,8 +2486,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); - wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_x, dst_y, - dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_slice_pitch, dst_x, + dst_y, dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); } wined3d_context_gl_unmap_bo_address(context_gl, &bo, 0, NULL); @@ -2477,8 +2501,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, checkGLcall("glBindBuffer"); } - wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, - dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, src_slice_pitch, dst_x, + dst_y, dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); if (bo.buffer_object) {

1 0

Paul Gofman : ddraw: Allow texture without DDSCAPS_TEXTURE for ddraw4 and earlier on software device.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 13ffebc7285198fe690aa44a5f70eb0c8fd3fa80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13ffebc7285198fe690aa44a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 26 16:18:01 2021 +0300 ddraw: Allow texture without DDSCAPS_TEXTURE for ddraw4 and earlier on software device. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 8 ++-- dlls/ddraw/tests/ddraw1.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 96 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 104 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 96 +++++++++++++++++++++++++++++++++++++ 5 files changed, 418 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=13ffebc7285198fe690a…

1 0

Paul Gofman : ddraw: Request read only texture access for read only maps.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 944014afb46b78a3adee7fbb694cb85289c16e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=944014afb46b78a3adee7fbb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 26 13:56:22 2021 +0300 ddraw: Request read only texture access for read only maps. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 19a1ae3d2d2..08e3811436d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1027,6 +1027,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, DWORD flags, HANDLE h) { struct wined3d_map_desc map_desc; + unsigned int wined3d_flags; struct wined3d_box box; HRESULT hr = DD_OK; @@ -1061,9 +1062,12 @@ static HRESULT surface_lock(struct ddraw_surface *surface, if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE, 0); if (SUCCEEDED(hr)) + { + wined3d_flags = wined3dmapflags_from_ddrawmapflags(flags); hr = wined3d_resource_map(wined3d_texture_get_resource - (ddraw_surface_get_default_texture(surface, DDRAW_SURFACE_RW)), surface->sub_resource_idx, - &map_desc, rect ? &box : NULL, wined3dmapflags_from_ddrawmapflags(flags)); + (ddraw_surface_get_default_texture(surface, wined3d_flags & WINED3D_MAP_WRITE ? DDRAW_SURFACE_RW + : DDRAW_SURFACE_READ)), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, wined3d_flags); + } if (FAILED(hr)) { wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_dispatch_indirect().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: e8bc9b290c412b209a36b49125a6ab4a580b7bb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8bc9b290c412b209a36b491… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:55 2021 -0500 d3d11: Use wined3d_device_context_dispatch_indirect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a94ccc7340e..5f1e52644a2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1128,7 +1128,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceConte static void STDMETHODCALLTYPE d3d11_immediate_context_DispatchIndirect(ID3D11DeviceContext1 *iface, ID3D11Buffer *buffer, UINT offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_buffer *buffer_impl; TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); @@ -1136,8 +1136,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DispatchIndirect(ID3D11Dev buffer_impl = unsafe_impl_from_ID3D11Buffer(buffer); wined3d_mutex_lock(); - wined3d_device_dispatch_compute_indirect(device->wined3d_device, - buffer_impl->wined3d_buffer, offset); + wined3d_device_context_dispatch_indirect(context->wined3d_context, buffer_impl->wined3d_buffer, offset); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_dispatch_indirect().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 794dd70ee03e42cd3fb165d10ddefdbadcf9e495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=794dd70ee03e42cd3fb165d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:54 2021 -0500 wined3d: Introduce wined3d_device_context_dispatch_indirect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 9 ++++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 2 ++ 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 12db34d1d0f..390a97a64d3 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -908,22 +908,21 @@ void CDECL wined3d_device_context_dispatch(struct wined3d_device_context *contex wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } -void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, +void CDECL wined3d_device_context_dispatch_indirect(struct wined3d_device_context *context, struct wined3d_buffer *buffer, unsigned int offset) { - const struct wined3d_state *state = cs->c.state; struct wined3d_cs_dispatch *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_DISPATCH; op->parameters.indirect = TRUE; op->parameters.u.indirect.buffer = buffer; op->parameters.u.indirect.offset = offset; - acquire_compute_pipeline_resources(state); + acquire_compute_pipeline_resources(context->state); wined3d_resource_acquire(&buffer->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_draw(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b96a0382c6a..7e123661cdb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4409,7 +4409,7 @@ void CDECL wined3d_device_dispatch_compute_indirect(struct wined3d_device *devic { TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - wined3d_cs_emit_dispatch_indirect(device->cs, buffer, offset); + wined3d_device_context_dispatch_indirect(&device->cs->c, buffer, offset); } void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c735587abc6..3b5945076d6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -167,6 +167,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_device_context_dispatch(ptr long long long) +@ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd6d2cbab5c..f0205a41c7e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4735,8 +4735,6 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; -void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, - struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f4fafafa80a..a78590413ac 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2557,6 +2557,8 @@ HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *devi void __cdecl wined3d_device_context_dispatch(struct wined3d_device_context *context, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); +void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_context *context, + struct wined3d_buffer *buffer, unsigned int offset); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_dispatch().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 3ffef8fc958b09fa00e6f483ca43860006a66528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ffef8fc958b09fa00e6f483… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:53 2021 -0500 d3d11: Use wined3d_device_context_dispatch(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5b52eba859a..a94ccc7340e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1114,13 +1114,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceContext1 *iface, UINT thread_group_count_x, UINT thread_group_count_y, UINT thread_group_count_z) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, thread_group_count_x %u, thread_group_count_y %u, thread_group_count_z %u.\n", iface, thread_group_count_x, thread_group_count_y, thread_group_count_z); wined3d_mutex_lock(); - wined3d_device_dispatch_compute(device->wined3d_device, + wined3d_device_context_dispatch(context->wined3d_context, thread_group_count_x, thread_group_count_y, thread_group_count_z); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_dispatch().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 324aa0a9f6f86e5bc27ac79d404780710c8b22ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=324aa0a9f6f86e5bc27ac79d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:52 2021 -0500 wined3d: Introduce wined3d_device_context_dispatch(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 9 ++++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 2 ++ 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6bf9827d3e1..12db34d1d0f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -891,22 +891,21 @@ static void acquire_compute_pipeline_resources(const struct wined3d_state *state state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); } -void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, +void CDECL wined3d_device_context_dispatch(struct wined3d_device_context *context, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) { - const struct wined3d_state *state = cs->c.state; struct wined3d_cs_dispatch *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_DISPATCH; op->parameters.indirect = FALSE; op->parameters.u.direct.group_count_x = group_count_x; op->parameters.u.direct.group_count_y = group_count_y; op->parameters.u.direct.group_count_z = group_count_z; - acquire_compute_pipeline_resources(state); + acquire_compute_pipeline_resources(context->state); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4041a7c0d7f..b96a0382c6a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4401,7 +4401,7 @@ void CDECL wined3d_device_dispatch_compute(struct wined3d_device *device, TRACE("device %p, group_count_x %u, group_count_y %u, group_count_z %u.\n", device, group_count_x, group_count_y, group_count_z); - wined3d_cs_emit_dispatch(device->cs, group_count_x, group_count_y, group_count_z); + wined3d_device_context_dispatch(&device->cs->c, group_count_x, group_count_y, group_count_z); } void CDECL wined3d_device_dispatch_compute_indirect(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 289716d1ae2..c735587abc6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -166,6 +166,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c15f6ab178..dd6d2cbab5c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4735,8 +4735,6 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; -void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, - unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 385ac7a8a07..f4fafafa80a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2555,6 +2555,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +void __cdecl wined3d_device_context_dispatch(struct wined3d_device_context *context, + unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_stream_output().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: f2d4714c8b513da41ca87ef96aa010321f80dc9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d4714c8b513da41ca87ef9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:51 2021 -0500 d3d11: Use wined3d_device_context_set_stream_output(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 67781c57ef5..5b52eba859a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1053,7 +1053,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceContext1 *iface, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *offsets) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int count, i; TRACE("iface %p, buffer_count %u, buffers %p, offsets %p.\n", iface, buffer_count, buffers, offsets); @@ -1064,12 +1064,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceC { struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - wined3d_device_set_stream_output(device->wined3d_device, i, + wined3d_device_context_set_stream_output(context->wined3d_context, i, buffer ? buffer->wined3d_buffer : NULL, offsets ? offsets[i] : 0); } for (; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) { - wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + wined3d_device_context_set_stream_output(context->wined3d_context, i, NULL, 0); } wined3d_mutex_unlock(); } @@ -2635,7 +2635,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon ID3D11DeviceContext1_RSSetState(iface, NULL); for (i = 0; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) { - wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + wined3d_device_context_set_stream_output(context->wined3d_context, i, NULL, 0); } wined3d_device_context_set_predication(context->wined3d_context, NULL, FALSE); wined3d_mutex_unlock();

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_stream_output().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 5df6103ce0e6aaf50db67ea4b7d27fc18d4e6bf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df6103ce0e6aaf50db67ea4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:50 2021 -0500 wined3d: Introduce wined3d_device_context_set_stream_output(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 46 +++++++++++++++++++++++++++------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9766dfada2d..4041a7c0d7f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1224,27 +1224,9 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset) { - struct wined3d_stream_output *stream; - struct wined3d_buffer *prev_buffer; - TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); - if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) - { - WARN("Invalid stream output %u.\n", idx); - return; - } - - stream = &device->cs->c.state->stream_output[idx]; - prev_buffer = stream->buffer; - - if (buffer) - wined3d_buffer_incref(buffer); - stream->buffer = buffer; - stream->offset = offset; - wined3d_device_context_emit_set_stream_output(&device->cs->c, idx, buffer, offset); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); + wined3d_device_context_set_stream_output(&device->cs->c, idx, buffer, offset); } struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_device *device, @@ -2389,6 +2371,32 @@ void CDECL wined3d_device_context_set_vertex_declaration(struct wined3d_device_c wined3d_vertex_declaration_decref(prev); } +void CDECL wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, + struct wined3d_buffer *buffer, unsigned int offset) +{ + struct wined3d_stream_output *stream; + struct wined3d_buffer *prev_buffer; + + TRACE("context %p, idx %u, buffer %p, offset %u.\n", context, idx, buffer, offset); + + if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) + { + WARN("Invalid stream output %u.\n", idx); + return; + } + + stream = &context->state->stream_output[idx]; + prev_buffer = stream->buffer; + + if (buffer) + wined3d_buffer_incref(buffer); + stream->buffer = buffer; + stream->offset = offset; + wined3d_device_context_emit_set_stream_output(context, idx, buffer, offset); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index fb9973354a0..289716d1ae2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -178,6 +178,7 @@ @ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr) +@ cdecl wined3d_device_context_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f8b4a89648..385ac7a8a07 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2579,6 +2579,8 @@ void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *co enum wined3d_shader_type type, struct wined3d_shader *shader); void __cdecl wined3d_device_context_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, + struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride); void __cdecl wined3d_device_context_set_unordered_access_view(struct wined3d_device_context *context,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021