[PATCH 4/5] d3d8: Support drawing from D3DPOOL_SYSTEMMEM index buffer.
Matteo Bruni
mbruni at codeweavers.com
Wed Dec 12 10:09:57 CST 2018
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
dlls/d3d8/buffer.c | 24 ++++++++++++++++---
dlls/d3d8/d3d8_private.h | 1 +
dlls/d3d8/device.c | 51 +++++++++++++++++++++++++++++++++++++---
3 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c
index 20efe6bd18a..58aaff275b1 100644
--- a/dlls/d3d8/buffer.c
+++ b/dlls/d3d8/buffer.c
@@ -377,6 +377,8 @@ static ULONG WINAPI d3d8_indexbuffer_AddRef(IDirect3DIndexBuffer8 *iface)
IDirect3DDevice8_AddRef(buffer->parent_device);
wined3d_mutex_lock();
wined3d_buffer_incref(buffer->wined3d_buffer);
+ if (buffer->draw_buffer)
+ wined3d_buffer_incref(buffer->draw_buffer);
wined3d_mutex_unlock();
}
@@ -396,6 +398,8 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface)
wined3d_mutex_lock();
wined3d_buffer_decref(buffer->wined3d_buffer);
+ if (buffer->draw_buffer)
+ wined3d_buffer_decref(buffer->draw_buffer);
wined3d_mutex_unlock();
/* Release the device last, as it may cause the device to be destroyed. */
@@ -592,6 +596,7 @@ static const struct wined3d_parent_ops d3d8_indexbuffer_wined3d_parent_ops =
HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device,
UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool)
{
+ const struct wined3d_parent_ops *parent_ops = &d3d8_null_wined3d_parent_ops;
struct wined3d_buffer_desc desc;
HRESULT hr;
@@ -604,19 +609,32 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de
desc.byte_width = size;
desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL;
- desc.bind_flags = WINED3D_BIND_INDEX_BUFFER;
+ desc.bind_flags = 0;
desc.access = wined3daccess_from_d3dpool(pool, usage)
| WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
desc.misc_flags = 0;
desc.structure_byte_stride = 0;
+ if (desc.access & WINED3D_RESOURCE_ACCESS_GPU)
+ {
+ desc.bind_flags = WINED3D_BIND_INDEX_BUFFER;
+ parent_ops = &d3d8_indexbuffer_wined3d_parent_ops;
+ }
+
buffer->IDirect3DIndexBuffer8_iface.lpVtbl = &d3d8_indexbuffer_vtbl;
d3d8_resource_init(&buffer->resource);
buffer->format = wined3dformat_from_d3dformat(format);
wined3d_mutex_lock();
- hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer,
- &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer);
+ hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, parent_ops, &buffer->wined3d_buffer);
+ if (SUCCEEDED(hr) && !(desc.access & WINED3D_RESOURCE_ACCESS_GPU))
+ {
+ desc.bind_flags = WINED3D_BIND_INDEX_BUFFER;
+ desc.access = WINED3D_RESOURCE_ACCESS_GPU;
+ if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer,
+ &d3d8_indexbuffer_wined3d_parent_ops, &buffer->draw_buffer)))
+ wined3d_buffer_decref(buffer->wined3d_buffer);
+ }
wined3d_mutex_unlock();
if (FAILED(hr))
{
diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h
index 03c3daf0227..60d70fa3524 100644
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -220,6 +220,7 @@ struct d3d8_indexbuffer
struct d3d8_resource resource;
struct wined3d_buffer *wined3d_buffer;
IDirect3DDevice8 *parent_device;
+ struct wined3d_buffer *draw_buffer;
enum wined3d_format_id format;
};
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 98311250d30..f5dffe6b707 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1899,6 +1899,7 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD
struct wined3d_buffer *wined3d_buffer;
struct d3d8_vertexbuffer *buffer;
unsigned int i, offset, stride;
+ enum wined3d_format_id format;
HRESULT hr;
TRACE("iface %p, token %#x.\n", iface, token);
@@ -1926,6 +1927,9 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD
if (buffer->draw_buffer)
device->upload_map |= 1u << i;
}
+ if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset))
+ && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer)
+ device->upload_map |= 1u << D3D8_MAX_STREAMS;
wined3d_mutex_unlock();
return D3D_OK;
@@ -2256,7 +2260,7 @@ static void d3d8_device_upload_sysmem_buffers(struct d3d8_device *device,
struct wined3d_buffer *dst_buffer;
HRESULT hr;
- map = device->upload_map;
+ map = device->upload_map & ((1u << D3D8_MAX_STREAMS) - 1);
while (map)
{
i = ffs(map) - 1;
@@ -2274,6 +2278,31 @@ static void d3d8_device_upload_sysmem_buffers(struct d3d8_device *device,
}
}
+static void d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device,
+ unsigned int start_idx, unsigned int idx_count)
+{
+ struct wined3d_box box = {0, 0, 0, 1, 0, 1};
+ struct d3d8_vertexbuffer *d3d8_buffer;
+ struct wined3d_buffer *dst_buffer;
+ enum wined3d_format_id format;
+ unsigned int offset, idx_size;
+ HRESULT hr;
+
+ if (~device->upload_map & (1u << D3D8_MAX_STREAMS))
+ return;
+
+ if (!(dst_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset)))
+ ERR("Failed to get index buffer.\n");
+ d3d8_buffer = wined3d_buffer_get_parent(dst_buffer);
+ idx_size = format == WINED3DFMT_R16_UINT ? 2 : 4;
+ box.left = offset + start_idx * idx_size;
+ box.right = box.left + idx_count * idx_size;
+ if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device,
+ wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0,
+ wined3d_buffer_get_resource(d3d8_buffer->wined3d_buffer), 0, &box, 0)))
+ ERR("Failed to update buffer.\n");
+}
+
static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface,
D3DPRIMITIVETYPE primitive_type, UINT start_vertex, UINT primitive_count)
{
@@ -2306,6 +2335,8 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface,
wined3d_mutex_lock();
d3d8_device_upload_sysmem_buffers(device, min_vertex_idx, vertex_count);
+ d3d8_device_upload_sysmem_index_buffer(device, start_idx,
+ vertex_count_from_primitive_count(primitive_type, primitive_count));
wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0);
hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx,
vertex_count_from_primitive_count(primitive_type, primitive_count));
@@ -2882,9 +2913,17 @@ static HRESULT WINAPI d3d8_device_SetIndices(IDirect3DDevice8 *iface,
{
struct d3d8_device *device = impl_from_IDirect3DDevice8(iface);
struct d3d8_indexbuffer *ib = unsafe_impl_from_IDirect3DIndexBuffer8(buffer);
+ struct wined3d_buffer *wined3d_buffer;
TRACE("iface %p, buffer %p, base_vertex_idx %u.\n", iface, buffer, base_vertex_idx);
+ if (!ib)
+ wined3d_buffer = NULL;
+ else if (ib->draw_buffer)
+ wined3d_buffer = ib->draw_buffer;
+ else
+ wined3d_buffer = ib->wined3d_buffer;
+
/* WineD3D takes an INT(due to d3d9), but d3d8 uses UINTs. Do I have to add a check here that
* the UINT doesn't cause an overflow in the INT? It seems rather unlikely because such large
* vertex buffers can't be created to address them with an index that requires the 32nd bit
@@ -2893,8 +2932,14 @@ static HRESULT WINAPI d3d8_device_SetIndices(IDirect3DDevice8 *iface,
*/
wined3d_mutex_lock();
wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx);
- wined3d_device_set_index_buffer(device->wined3d_device,
- ib ? ib->wined3d_buffer : NULL, ib ? ib->format : WINED3DFMT_UNKNOWN, 0);
+ wined3d_device_set_index_buffer(device->wined3d_device, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN, 0);
+ if (!device->recording)
+ {
+ if (ib && ib->draw_buffer)
+ device->upload_map |= (1u << D3D8_MAX_STREAMS);
+ else
+ device->upload_map &= ~(1u << D3D8_MAX_STREAMS);
+ }
wined3d_mutex_unlock();
return D3D_OK;
--
2.18.1
More information about the wine-devel
mailing list