Skip to content

W
wine-winehq
Commit b28e9f64 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Enforce WINED3DUSAGE_RENDERTARGET format restrictions on resource creation.

parent 6f321ff2
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
dlls/wined3d/resource.c
View file @ b28e9f64
...@@ -85,6 +85,13 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * ...@@ -85,6 +85,13 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
{ {
const struct wined3d *d3d = device->wined3d; const struct wined3d *d3d = device->wined3d;
resource_check_usage(usage);
if (pool != WINED3D_POOL_SCRATCH)
{
if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags & WINED3DFMT_FLAG_RENDERTARGET))
return WINED3DERR_INVALIDCALL;
}
resource->ref = 1; resource->ref = 1;
resource->device = device; resource->device = device;
resource->type = type; resource->type = type;
...@@ -106,8 +113,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * ...@@ -106,8 +113,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
resource->resource_ops = resource_ops; resource->resource_ops = resource_ops;
list_init(&resource->privateData); list_init(&resource->privateData);
resource_check_usage(usage);
if (size) if (size)
{ {
resource->heap_memory = wined3d_resource_allocate_sysmem(size); resource->heap_memory = wined3d_resource_allocate_sysmem(size);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment