Zebediah Figura : d3d9: Use the wined3d_streaming_buffer helpers to manage the streaming index buffer.
Alexandre Julliard
julliard at winehq.org
Tue Jul 12 16:51:40 CDT 2022
Module: wine
Branch: master
Commit: 24c900b91f8643d14c6dfed9881603e2188902ff
URL: https://gitlab.winehq.org/wine/wine/-/commit/24c900b91f8643d14c6dfed9881603e2188902ff
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Fri Jul 8 18:08:33 2022 -0500
d3d9: Use the wined3d_streaming_buffer helpers to manage the streaming index buffer.
---
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);
More information about the wine-cvs
mailing list