Zebediah Figura : d3d8: Use the wined3d_streaming_buffer helpers to manage the streaming vertex buffer.
Alexandre Julliard
julliard at winehq.org
Tue Jul 12 16:51:39 CDT 2022
Module: wine
Branch: master
Commit: 301a48f12daf7e21f8d7e73c907293a2bd0187bd
URL: https://gitlab.winehq.org/wine/wine/-/commit/301a48f12daf7e21f8d7e73c907293a2bd0187bd
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Fri Jul 8 18:15:04 2022 -0500
d3d8: Use the wined3d_streaming_buffer helpers to manage the streaming vertex buffer.
---
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)
More information about the wine-cvs
mailing list