[PATCH 1/5] d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_vertex_buffer().
Henri Verbeet
hverbeet at codeweavers.com
Thu Feb 8 15:58:43 CST 2018
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/d3d9/device.c | 15 +++++++++++----
dlls/wined3d/buffer.c | 46 ----------------------------------------------
dlls/wined3d/wined3d.spec | 1 -
include/wine/wined3d.h | 10 ----------
4 files changed, 11 insertions(+), 61 deletions(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 9dd58a3..3bd23b6 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2543,15 +2543,22 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN
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);
- hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY,
- WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer);
- if (FAILED(hr))
+ desc.byte_width = size;
+ desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY;
+ desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER;
+ desc.access = WINED3D_RESOURCE_ACCESS_GPU;
+ 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("(%p) wined3d_buffer_create_vb failed with hr = %08x.\n", device, hr);
+ ERR("Failed to create vertex buffer, hr %#x.\n", hr);
return hr;
}
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index f1b4556..f907ece 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1441,49 +1441,3 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct
return WINED3D_OK;
}
-
-static DWORD resource_access_from_pool(enum wined3d_pool pool)
-{
- switch (pool)
- {
- case WINED3D_POOL_DEFAULT:
- return WINED3D_RESOURCE_ACCESS_GPU;
-
- case WINED3D_POOL_MANAGED:
- return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP;
-
- case WINED3D_POOL_SYSTEM_MEM:
- return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP;
-
- default:
- FIXME("Unhandled pool %#x.\n", pool);
- return 0;
- }
-}
-
-HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool,
- void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer)
-{
- struct wined3d_buffer_desc desc;
-
- TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n",
- device, size, usage, pool, parent, parent_ops, buffer);
-
- if (usage & WINED3DUSAGE_SCRATCH)
- {
- /* The d3d9 tests shows that this is not allowed. It doesn't make much
- * sense anyway, SCRATCH buffers wouldn't be usable anywhere. */
- WARN("Vertex buffer with WINED3DUSAGE_SCRATCH requested, returning WINED3DERR_INVALIDCALL.\n");
- *buffer = NULL;
- return WINED3DERR_INVALIDCALL;
- }
-
- desc.byte_width = size;
- desc.usage = usage;
- desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER;
- desc.access = resource_access_from_pool(pool);
- desc.misc_flags = 0;
- desc.structure_byte_stride = 0;
-
- return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer);
-}
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index f65cc85..7c1b5e3 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -28,7 +28,6 @@
@ cdecl wined3d_blend_state_incref(ptr)
@ cdecl wined3d_buffer_create(ptr ptr ptr ptr ptr ptr)
-@ cdecl wined3d_buffer_create_vb(ptr long long long ptr ptr ptr)
@ cdecl wined3d_buffer_decref(ptr)
@ cdecl wined3d_buffer_get_parent(ptr)
@ cdecl wined3d_buffer_get_resource(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index f6ffdba..9d551d8 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -680,13 +680,6 @@ enum wined3d_resource_type
WINED3D_RTYPE_TEXTURE_3D = 3,
};
-enum wined3d_pool
-{
- WINED3D_POOL_DEFAULT = 0,
- WINED3D_POOL_MANAGED = 1,
- WINED3D_POOL_SYSTEM_MEM = 2,
-};
-
enum wined3d_query_type
{
WINED3D_QUERY_TYPE_VCACHE = 4,
@@ -2195,9 +2188,6 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d,
HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc,
const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops,
struct wined3d_buffer **buffer);
-HRESULT __cdecl wined3d_buffer_create_vb(struct wined3d_device *device, UINT length, DWORD usage,
- enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops,
- struct wined3d_buffer **buffer);
ULONG __cdecl wined3d_buffer_decref(struct wined3d_buffer *buffer);
void * __cdecl wined3d_buffer_get_parent(const struct wined3d_buffer *buffer);
struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buffer *buffer);
--
2.1.4
More information about the wine-devel
mailing list