[PATCH 0/5] MR410: wined3d: Introduce helpers to manage UP streaming buffers. - Wine-gitlab - list.winehq.org

newer
[PATCH 0/1] MR433: d3d10: Use CRT...

[PATCH 0/5] MR410: wined3d: Introduce helpers to manage UP streaming buffers.

older
[PATCH 0/1] MR437: mshtml: Wine...

Zebediah Figura (＠zfigura)

9 Jul 2022 9 Jul '22

12:13 a.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/410

Reply

Sign in to reply online Use email software

Show replies by date

Zebediah Figura

9 Jul 9 Jul

12:13 a.m.

New subject: [PATCH 1/5] wined3d: Introduce a wined3d_streaming_buffer helper.

From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 78 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 + include/wine/wined3d.h | 24 ++++++++++++ 3 files changed, 104 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9b0d98139ce..2131123bf44 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1647,3 +1647,81 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct return device->adapter->adapter_ops->adapter_create_buffer(device, desc, data, parent, parent_ops, buffer); } + +static HRESULT wined3d_streaming_buffer_prepare(struct wined3d_device *device, + struct wined3d_streaming_buffer *buffer, unsigned int min_size) +{ + struct wined3d_buffer *wined3d_buffer; + struct wined3d_buffer_desc desc; + unsigned int old_size = 0; + unsigned int size; + HRESULT hr; + + if (buffer->buffer) + { + old_size = buffer->buffer->resource.size; + if (old_size >= min_size) + return S_OK; + } + + size = max(old_size * 2, min_size); + TRACE("Growing buffer to %u bytes.\n", size); + + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC; + desc.bind_flags = buffer->bind_flags; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (SUCCEEDED(hr = wined3d_buffer_create(device, &desc, NULL, NULL, &wined3d_null_parent_ops, &wined3d_buffer))) + { + if (buffer->buffer) + wined3d_buffer_decref(buffer->buffer); + buffer->buffer = wined3d_buffer; + buffer->pos = 0; + } + return hr; +} + +HRESULT CDECL wined3d_streaming_buffer_upload(struct wined3d_device *device, struct wined3d_streaming_buffer *buffer, + const void *data, unsigned int size, unsigned int stride, unsigned int *ret_pos) +{ + unsigned int map_flags = WINED3D_MAP_WRITE; + struct wined3d_resource *resource; + struct wined3d_map_desc map_desc; + unsigned int pos, align; + struct wined3d_box box; + HRESULT hr; + + TRACE("device %p, buffer %p, data %p, size %u, stride %u, ret_pos %p.\n", + device, buffer, data, size, stride, ret_pos); + + if (FAILED(hr = wined3d_streaming_buffer_prepare(device, buffer, size))) + return hr; + resource = &buffer->buffer->resource; + + pos = buffer->pos; + if ((align = pos % stride)) + align = stride - align; + if (pos + size + align > resource->size) + { + pos = 0; + map_flags |= WINED3D_MAP_DISCARD; + } + else + { + pos += align; + map_flags |= WINED3D_MAP_NOOVERWRITE; + } + + wined3d_box_set(&box, pos, 0, pos + size, 1, 0, 1); + if (SUCCEEDED(hr = wined3d_resource_map(resource, 0, &map_desc, &box, map_flags))) + { + memcpy(map_desc.data, data, size); + wined3d_resource_unmap(resource, 0); + *ret_pos = pos; + buffer->pos = pos + size; + } + return hr; +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 63220e1222c..1f9c398a5c5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,8 @@ @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) +@ cdecl wined3d_streaming_buffer_upload(ptr ptr ptr long long ptr) + @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 116aea82348..ce2da6e4c04 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2320,6 +2320,13 @@ struct wined3d_private_data typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resource); +struct wined3d_streaming_buffer +{ + struct wined3d_buffer *buffer; + unsigned int pos; + unsigned int bind_flags; +}; + void __stdcall wined3d_mutex_lock(void); void __stdcall wined3d_mutex_unlock(void); @@ -2825,6 +2832,9 @@ HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *st HRESULT __cdecl wined3d_stateblock_set_vs_consts_i(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); +HRESULT __cdecl wined3d_streaming_buffer_upload(struct wined3d_device *device, struct wined3d_streaming_buffer *buffer, + const void *data, unsigned int size, unsigned int stride, unsigned int *pos); + HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops, @@ -2922,6 +2932,20 @@ ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaratio HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_shader_signature *signature, const void *byte_code, SIZE_T byte_code_size); +static inline void wined3d_streaming_buffer_init(struct wined3d_streaming_buffer *buffer, unsigned int bind_flags) +{ + memset(buffer, 0, sizeof(*buffer)); + buffer->bind_flags = bind_flags; +} + +static inline void wined3d_streaming_buffer_cleanup(struct wined3d_streaming_buffer *buffer) +{ + if (buffer->buffer) + wined3d_buffer_decref(buffer->buffer); + buffer->buffer = NULL; + buffer->pos = 0; +} + /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/410

Reply

Sign in to reply online Use email software

Zebediah Figura

12:13 a.m.

New subject: [PATCH 2/5] d3d8: Use the wined3d_streaming_buffer helpers to manage the streaming vertex buffer.

From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 5 +- dlls/d3d8/device.c | 105 +++++---------------------------------- 2 files changed, 14 insertions(+), 96 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 755991a64c7..53d131f182d 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -123,10 +123,7 @@ struct d3d8_device struct FvfToDecl *decls; UINT numConvertedDecls, declArraySize; - /* User data draws */ - struct wined3d_buffer *vertex_buffer; - UINT vertex_buffer_size; - UINT vertex_buffer_pos; + struct wined3d_streaming_buffer vertex_buffer; struct wined3d_buffer *index_buffer; UINT index_buffer_size; UINT index_buffer_pos; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6c1646a1893..ee12d3809e6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -625,8 +625,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) } heap_free(device->decls); - if (device->vertex_buffer) - wined3d_buffer_decref(device->vertex_buffer); + wined3d_streaming_buffer_cleanup(&device->vertex_buffer); if (device->index_buffer) wined3d_buffer_decref(device->index_buffer); @@ -963,12 +962,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_mutex_lock(); - if (device->vertex_buffer) - { - wined3d_buffer_decref(device->vertex_buffer); - device->vertex_buffer = NULL; - device->vertex_buffer_size = 0; - } + wined3d_streaming_buffer_cleanup(&device->vertex_buffer); if (device->index_buffer) { wined3d_buffer_decref(device->index_buffer); @@ -2546,55 +2540,15 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, return D3D_OK; } -/* The caller is responsible for wined3d locking */ -static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UINT min_size) -{ - HRESULT hr; - - if (device->vertex_buffer_size < min_size || !device->vertex_buffer) - { - UINT size = max(device->vertex_buffer_size * 2, min_size); - struct wined3d_buffer_desc desc; - struct wined3d_buffer *buffer; - - TRACE("Growing vertex buffer to %u bytes\n", size); - - desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC; - desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, - NULL, NULL, &d3d8_null_wined3d_parent_ops, &buffer))) - { - ERR("Failed to create vertex buffer, hr %#x.\n", hr); - return hr; - } - - if (device->vertex_buffer) - wined3d_buffer_decref(device->vertex_buffer); - - device->vertex_buffer = buffer; - device->vertex_buffer_size = size; - device->vertex_buffer_pos = 0; - } - return D3D_OK; -} - static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, D3DPRIMITIVETYPE primitive_type, UINT primitive_count, const void *data, UINT stride) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); - struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; UINT size = vtx_count * stride; - struct wined3d_resource *vb; - UINT vb_pos, align; + unsigned int vb_pos; + HRESULT hr; TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); @@ -2606,29 +2560,12 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, } wined3d_mutex_lock(); - hr = d3d8_device_prepare_vertex_buffer(device, size); - if (FAILED(hr)) - goto done; - vb_pos = device->vertex_buffer_pos; - align = vb_pos % stride; - if (align) align = stride - align; - if (vb_pos + size + align > device->vertex_buffer_size) - vb_pos = 0; - else - vb_pos += align; - - wined3d_box.left = vb_pos; - wined3d_box.right = vb_pos + size; - vb = wined3d_buffer_get_resource(device->vertex_buffer); - if (FAILED(wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, + &device->vertex_buffer, data, size, stride, &vb_pos))) goto done; - memcpy(wined3d_map_desc.data, data, size); - wined3d_resource_unmap(vb, 0); - device->vertex_buffer_pos = vb_pos + size; - hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, stride); if (FAILED(hr)) goto done; @@ -2692,8 +2629,8 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface UINT idx_size = idx_count * idx_fmt_size; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; - struct wined3d_resource *ib, *vb; unsigned int base_vertex_idx; + struct wined3d_resource *ib; UINT vb_pos, ib_pos, align; HRESULT hr; @@ -2710,27 +2647,9 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_mutex_lock(); - hr = d3d8_device_prepare_vertex_buffer(device, vtx_size); - if (FAILED(hr)) - goto done; - - vb_pos = device->vertex_buffer_pos; - align = vb_pos % vertex_stride; - if (align) align = vertex_stride - align; - if (vb_pos + vtx_size + align > device->vertex_buffer_size) - vb_pos = 0; - else - vb_pos += align; - - wined3d_box.left = vb_pos; - wined3d_box.right = vb_pos + vtx_size; - vb = wined3d_buffer_get_resource(device->vertex_buffer); - if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, &device->vertex_buffer, + (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size, vertex_stride, &vb_pos))) goto done; - memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size); - wined3d_resource_unmap(vb, 0); - device->vertex_buffer_pos = vb_pos + vtx_size; hr = d3d8_device_prepare_index_buffer(device, idx_size); if (FAILED(hr)) @@ -2754,7 +2673,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; - hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, vertex_stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, vertex_stride); if (FAILED(hr)) goto done; @@ -3799,6 +3718,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->stateblock_state = wined3d_stateblock_get_state(device->state); device->update_state = device->state; + wined3d_streaming_buffer_init(&device->vertex_buffer, WINED3D_BIND_VERTEX_BUFFER); + if (!parameters->Windowed) { if (!focus_window) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/410

Reply

Sign in to reply online Use email software

Zebediah Figura

12:13 a.m.

New subject: [PATCH 3/5] d3d8: Use the wined3d_streaming_buffer helpers to manage the streaming index buffer.

From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 5 +-- dlls/d3d8/device.c | 78 ++++------------------------------------ 2 files changed, 8 insertions(+), 75 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 53d131f182d..33238e19b1a 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -123,10 +123,7 @@ struct d3d8_device struct FvfToDecl *decls; UINT numConvertedDecls, declArraySize; - struct wined3d_streaming_buffer vertex_buffer; - struct wined3d_buffer *index_buffer; - UINT index_buffer_size; - UINT index_buffer_pos; + struct wined3d_streaming_buffer vertex_buffer, index_buffer; LONG device_state; DWORD sysmem_vb : 16; /* D3D8_MAX_STREAMS */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ee12d3809e6..269ddda17cf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -626,8 +626,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) heap_free(device->decls); wined3d_streaming_buffer_cleanup(&device->vertex_buffer); - if (device->index_buffer) - wined3d_buffer_decref(device->index_buffer); + wined3d_streaming_buffer_cleanup(&device->index_buffer); if (device->recording) wined3d_stateblock_decref(device->recording); @@ -963,12 +962,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_streaming_buffer_cleanup(&device->vertex_buffer); - if (device->index_buffer) - { - wined3d_buffer_decref(device->index_buffer); - device->index_buffer = NULL; - device->index_buffer_size = 0; - } + wined3d_streaming_buffer_cleanup(&device->index_buffer); if (device->recording) wined3d_stateblock_decref(device->recording); @@ -2580,43 +2574,6 @@ done: return hr; } -/* The caller is responsible for wined3d locking */ -static HRESULT d3d8_device_prepare_index_buffer(struct d3d8_device *device, UINT min_size) -{ - HRESULT hr; - - if (device->index_buffer_size < min_size || !device->index_buffer) - { - UINT size = max(device->index_buffer_size * 2, min_size); - struct wined3d_buffer_desc desc; - struct wined3d_buffer *buffer; - - TRACE("Growing index buffer to %u bytes\n", size); - - desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL; - desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, - NULL, NULL, &d3d8_null_wined3d_parent_ops, &buffer))) - { - ERR("Failed to create index buffer, hr %#x.\n", hr); - return hr; - } - - if (device->index_buffer) - wined3d_buffer_decref(device->index_buffer); - - device->index_buffer = buffer; - device->index_buffer_size = size; - device->index_buffer_pos = 0; - } - return D3D_OK; -} - static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface, D3DPRIMITIVETYPE primitive_type, UINT min_vertex_idx, UINT vertex_count, UINT primitive_count, const void *index_data, D3DFORMAT index_format, @@ -2625,13 +2582,9 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4; + unsigned int base_vertex_idx, vb_pos, ib_pos; UINT vtx_size = vertex_count * vertex_stride; UINT idx_size = idx_count * idx_fmt_size; - struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; - unsigned int base_vertex_idx; - struct wined3d_resource *ib; - UINT vb_pos, ib_pos, align; HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " @@ -2651,33 +2604,15 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size, vertex_stride, &vb_pos))) goto done; - hr = d3d8_device_prepare_index_buffer(device, idx_size); - if (FAILED(hr)) - goto done; - - ib_pos = device->index_buffer_pos; - align = ib_pos % idx_fmt_size; - if (align) align = idx_fmt_size - align; - if (ib_pos + idx_size + align > device->index_buffer_size) - ib_pos = 0; - else - ib_pos += align; - - wined3d_box.left = ib_pos; - wined3d_box.right = ib_pos + idx_size; - ib = wined3d_buffer_get_resource(device->index_buffer); - if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, &device->index_buffer, + index_data, idx_size, idx_fmt_size, &ib_pos))) goto done; - memcpy(wined3d_map_desc.data, index_data, idx_size); - wined3d_resource_unmap(ib, 0); - device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, vertex_stride); if (FAILED(hr)) goto done; - wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer.buffer, wined3dformat_from_d3dformat(index_format)); base_vertex_idx = vb_pos / vertex_stride - min_vertex_idx; wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); @@ -3719,6 +3654,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->update_state = device->state; wined3d_streaming_buffer_init(&device->vertex_buffer, WINED3D_BIND_VERTEX_BUFFER); + wined3d_streaming_buffer_init(&device->index_buffer, WINED3D_BIND_INDEX_BUFFER); if (!parameters->Windowed) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/410

Reply

Sign in to reply online Use email software

Zebediah Figura

12:13 a.m.

New subject: [PATCH 4/5] d3d9: Use the wined3d_streaming_buffer helpers to manage the streaming vertex buffer.

From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d9/d3d9_private.h | 5 +- dlls/d3d9/device.c | 106 +++++---------------------------------- 2 files changed, 15 insertions(+), 96 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 50c3b38d795..65aa3623293 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -100,9 +100,8 @@ struct d3d9_device struct fvf_declaration *fvf_decls; UINT fvf_decl_count, fvf_decl_size; - struct wined3d_buffer *vertex_buffer; - UINT vertex_buffer_size; - UINT vertex_buffer_pos; + struct wined3d_streaming_buffer vertex_buffer; + struct wined3d_buffer *index_buffer; UINT index_buffer_size; UINT index_buffer_pos; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ac6a7054838..5708155db59 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -663,8 +663,7 @@ static ULONG WINAPI DECLSPEC_HOTPATCH d3d9_device_Release(IDirect3DDevice9Ex *if } heap_free(device->fvf_decls); - if (device->vertex_buffer) - wined3d_buffer_decref(device->vertex_buffer); + wined3d_streaming_buffer_cleanup(&device->vertex_buffer); if (device->index_buffer) wined3d_buffer_decref(device->index_buffer); @@ -1079,12 +1078,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_mutex_lock(); - if (device->vertex_buffer) - { - wined3d_buffer_decref(device->vertex_buffer); - device->vertex_buffer = NULL; - device->vertex_buffer_size = 0; - } + wined3d_streaming_buffer_cleanup(&device->vertex_buffer); if (device->index_buffer) { @@ -3080,54 +3074,14 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface return D3D_OK; } -/* The caller is responsible for wined3d locking */ -static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UINT min_size) -{ - HRESULT hr; - - if (device->vertex_buffer_size < min_size || !device->vertex_buffer) - { - UINT size = max(device->vertex_buffer_size * 2, min_size); - struct wined3d_buffer_desc desc; - struct wined3d_buffer *buffer; - - TRACE("Growing vertex buffer to %u bytes.\n", size); - - desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC; - desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, - NULL, NULL, &d3d9_null_wined3d_parent_ops, &buffer))) - { - ERR("Failed to create vertex buffer, hr %#x.\n", hr); - return hr; - } - - if (device->vertex_buffer) - wined3d_buffer_decref(device->vertex_buffer); - - device->vertex_buffer = buffer; - device->vertex_buffer_size = size; - device->vertex_buffer_pos = 0; - } - return D3D_OK; -} - static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, D3DPRIMITIVETYPE primitive_type, UINT primitive_count, const void *data, UINT stride) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); - struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; UINT size = vtx_count * stride; - struct wined3d_resource *vb; - UINT vb_pos, align; + unsigned int vb_pos; + HRESULT hr; TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); @@ -3152,29 +3106,11 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } - hr = d3d9_device_prepare_vertex_buffer(device, size); - if (FAILED(hr)) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, + &device->vertex_buffer, data, size, stride, &vb_pos))) goto done; - vb_pos = device->vertex_buffer_pos; - align = vb_pos % stride; - if (align) align = stride - align; - if (vb_pos + size + align > device->vertex_buffer_size) - vb_pos = 0; - else - vb_pos += align; - - wined3d_box.left = vb_pos; - wined3d_box.right = vb_pos + size; - vb = wined3d_buffer_get_resource(device->vertex_buffer); - if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) - goto done; - memcpy(wined3d_map_desc.data, data, size); - wined3d_resource_unmap(vb, 0); - device->vertex_buffer_pos = vb_pos + size; - - hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, stride); if (FAILED(hr)) goto done; @@ -3240,7 +3176,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa UINT idx_size = idx_count * idx_fmt_size; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; - struct wined3d_resource *ib, *vb; + struct wined3d_resource *ib; UINT vb_pos, ib_pos, align; HRESULT hr; @@ -3269,27 +3205,9 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa return D3DERR_INVALIDCALL; } - hr = d3d9_device_prepare_vertex_buffer(device, vtx_size); - if (FAILED(hr)) - goto done; - - vb_pos = device->vertex_buffer_pos; - align = vb_pos % vertex_stride; - if (align) align = vertex_stride - align; - if (vb_pos + vtx_size + align > device->vertex_buffer_size) - vb_pos = 0; - else - vb_pos += align; - - wined3d_box.left = vb_pos; - wined3d_box.right = vb_pos + vtx_size; - vb = wined3d_buffer_get_resource(device->vertex_buffer); - if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, &device->vertex_buffer, + (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size, vertex_stride, &vb_pos))) goto done; - memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size); - wined3d_resource_unmap(vb, 0); - device->vertex_buffer_pos = vb_pos + vtx_size; hr = d3d9_device_prepare_index_buffer(device, idx_size); if (FAILED(hr)) @@ -3313,7 +3231,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; - hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, vertex_stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, vertex_stride); if (FAILED(hr)) goto done; @@ -4754,6 +4672,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine device->stateblock_state = wined3d_stateblock_get_state(device->state); device->update_state = device->state; + wined3d_streaming_buffer_init(&device->vertex_buffer, WINED3D_BIND_VERTEX_BUFFER); + if (flags & D3DCREATE_MULTITHREADED) wined3d_device_set_multithreaded(device->wined3d_device); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/410

Reply

Sign in to reply online Use email software

Zebediah Figura

12:13 a.m.

New subject: [PATCH 5/5] d3d9: Use the wined3d_streaming_buffer helpers to manage the streaming index buffer.

From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d9/d3d9_private.h | 6 +--- dlls/d3d9/device.c | 78 ++++------------------------------------ 2 files changed, 8 insertions(+), 76 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 65aa3623293..c3eb9728f6e 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -100,11 +100,7 @@ struct d3d9_device struct fvf_declaration *fvf_decls; UINT fvf_decl_count, fvf_decl_size; - struct wined3d_streaming_buffer vertex_buffer; - - struct wined3d_buffer *index_buffer; - UINT index_buffer_size; - UINT index_buffer_pos; + struct wined3d_streaming_buffer vertex_buffer, index_buffer; struct d3d9_surface *render_targets[D3D_MAX_SIMULTANEOUS_RENDERTARGETS]; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5708155db59..0995eb7f2c4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -664,8 +664,7 @@ static ULONG WINAPI DECLSPEC_HOTPATCH d3d9_device_Release(IDirect3DDevice9Ex *if heap_free(device->fvf_decls); wined3d_streaming_buffer_cleanup(&device->vertex_buffer); - if (device->index_buffer) - wined3d_buffer_decref(device->index_buffer); + wined3d_streaming_buffer_cleanup(&device->index_buffer); for (i = 0; i < device->implicit_swapchain_count; ++i) { @@ -1079,13 +1078,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_mutex_lock(); wined3d_streaming_buffer_cleanup(&device->vertex_buffer); - - if (device->index_buffer) - { - wined3d_buffer_decref(device->index_buffer); - device->index_buffer = NULL; - device->index_buffer_size = 0; - } + wined3d_streaming_buffer_cleanup(&device->index_buffer); if (!extended) { @@ -3127,43 +3120,6 @@ done: return hr; } -/* The caller is responsible for wined3d locking */ -static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT min_size) -{ - HRESULT hr; - - if (device->index_buffer_size < min_size || !device->index_buffer) - { - UINT size = max(device->index_buffer_size * 2, min_size); - struct wined3d_buffer_desc desc; - struct wined3d_buffer *buffer; - - TRACE("Growing index buffer to %u bytes.\n", size); - - desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL; - desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, - NULL, NULL, &d3d9_null_wined3d_parent_ops, &buffer))) - { - ERR("Failed to create index buffer, hr %#x.\n", hr); - return hr; - } - - if (device->index_buffer) - wined3d_buffer_decref(device->index_buffer); - - device->index_buffer = buffer; - device->index_buffer_size = size; - device->index_buffer_pos = 0; - } - return D3D_OK; -} - static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *iface, D3DPRIMITIVETYPE primitive_type, UINT min_vertex_idx, UINT vertex_count, UINT primitive_count, const void *index_data, D3DFORMAT index_format, @@ -3174,10 +3130,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4; UINT vtx_size = vertex_count * vertex_stride; UINT idx_size = idx_count * idx_fmt_size; - struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; - struct wined3d_resource *ib; - UINT vb_pos, ib_pos, align; + UINT vb_pos, ib_pos; HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " @@ -3209,34 +3162,16 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size, vertex_stride, &vb_pos))) goto done; - hr = d3d9_device_prepare_index_buffer(device, idx_size); - if (FAILED(hr)) - goto done; - - ib_pos = device->index_buffer_pos; - align = ib_pos % idx_fmt_size; - if (align) align = idx_fmt_size - align; - if (ib_pos + idx_size + align > device->index_buffer_size) - ib_pos = 0; - else - ib_pos += align; - - wined3d_box.left = ib_pos; - wined3d_box.right = ib_pos + idx_size; - ib = wined3d_buffer_get_resource(device->index_buffer); - if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, &device->index_buffer, + index_data, idx_size, idx_fmt_size, &ib_pos))) goto done; - memcpy(wined3d_map_desc.data, index_data, idx_size); - wined3d_resource_unmap(ib, 0); - device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, vertex_stride); if (FAILED(hr)) goto done; d3d9_generate_auto_mipmaps(device); - wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer.buffer, wined3dformat_from_d3dformat(index_format)); wined3d_device_apply_stateblock(device->wined3d_device, device->state); @@ -4673,6 +4608,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine device->update_state = device->state; wined3d_streaming_buffer_init(&device->vertex_buffer, WINED3D_BIND_VERTEX_BUFFER); + wined3d_streaming_buffer_init(&device->index_buffer, WINED3D_BIND_INDEX_BUFFER); if (flags & D3DCREATE_MULTITHREADED) wined3d_device_set_multithreaded(device->wined3d_device); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/410

Reply

Sign in to reply online Use email software

Jan Sikorski (＠jsikorski)

12 Jul 12 Jul

6:03 p.m.

New subject: [PATCH 0/5] MR410: wined3d: Introduce helpers to manage UP streaming buffers. - approved

This merge request was approved by Jan Sikorski. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/410

Reply

Sign in to reply online Use email software

1257

Age (days ago)

1260

Last active (days ago)

Download

6 comments

3 participants

tags

participants (3)

Jan Sikorski (＠jsikorski)
Zebediah Figura
Zebediah Figura (＠zfigura)