wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Check if device memory is CPU accessible in d3d12_resource_Map().

Browse Source
This commit is contained in:
Józef Kucia 2016-10-24 13:20:09 +02:00
parent 3161f346b6
commit e19e428ed0
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/vkd3d/resource.c
View File

@ -460,11 +460,15 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT
TRACE("iface %p, sub_resource %u, read_range %p, data %p.\n", TRACE("iface %p, sub_resource %u, read_range %p, data %p.\n",
iface, sub_resource, read_range, data); iface, sub_resource, read_range, data);
FIXME("Ignoring read range %p.\n", read_range);
device = resource->device; device = resource->device;
vk_procs = &device->vk_procs; vk_procs = &device->vk_procs;
if (!is_cpu_accessible_heap(&resource->heap_properties))
{
WARN("Resource is not CPU accessible.\n");
return E_INVALIDARG;
}
if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER) if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER)
{ {
/* Textures seem to be mappable only on UMA adapters. */ /* Textures seem to be mappable only on UMA adapters. */
@ -478,6 +482,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT
return E_NOTIMPL; return E_NOTIMPL;
} }
FIXME("Ignoring read range %p.\n", read_range);
if (!resource->map_count) if (!resource->map_count)
{ {
if ((vr = VK_CALL(vkMapMemory(device->vk_device, resource->vk_memory, if ((vr = VK_CALL(vkMapMemory(device->vk_device, resource->vk_memory,
@ -692,6 +698,8 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st
resource->map_count = 0; resource->map_count = 0;
resource->map_data = NULL; resource->map_data = NULL;
resource->heap_properties = *heap_properties;
resource->device = device; resource->device = device;
ID3D12Device_AddRef(&device->ID3D12Device_iface); ID3D12Device_AddRef(&device->ID3D12Device_iface);
@ -740,6 +748,8 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, const D3D12_RESOURCE_D
object->external = true; object->external = true;
object->map_count = 0; object->map_count = 0;
object->map_data = NULL; object->map_data = NULL;
memset(&object->heap_properties, 0, sizeof(object->heap_properties));
object->heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
object->device = d3d12_device; object->device = d3d12_device;
ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface); ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface);

14
libs/vkd3d/vkd3d_private.h
View File

@ -133,6 +133,8 @@ struct d3d12_resource
unsigned int map_count; unsigned int map_count;
void *map_data; void *map_data;
D3D12_HEAP_PROPERTIES heap_properties;
struct d3d12_device *device; struct d3d12_device *device;
}; };
@ -368,6 +370,18 @@ bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDE
bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN;
bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN;
static inline bool is_cpu_accessible_heap(const struct D3D12_HEAP_PROPERTIES *properties)
{
if (properties->Type == D3D12_HEAP_TYPE_DEFAULT)
return false;
if (properties->Type == D3D12_HEAP_TYPE_CUSTOM)
{
return properties->CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE
|| properties->CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_BACK;
}
return true;
}
HRESULT return_interface(IUnknown *iface, REFIID iface_riid, HRESULT return_interface(IUnknown *iface, REFIID iface_riid,
REFIID requested_riid, void **object) DECLSPEC_HIDDEN; REFIID requested_riid, void **object) DECLSPEC_HIDDEN;

2
tests/d3d12.c
View File

@ -2716,7 +2716,7 @@ static void test_map_resource(void)
/* Resources on a DEFAULT heap cannot be mapped. */ /* Resources on a DEFAULT heap cannot be mapped. */
hr = ID3D12Resource_Map(resource, 0, NULL, &data); hr = ID3D12Resource_Map(resource, 0, NULL, &data);
todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
ID3D12Resource_Release(resource); ID3D12Resource_Release(resource);