wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Validation should happen in the d3d12/Vulkan validation layers.

Browse Source 
Unless we have tests that say otherwise.
This commit is contained in:
Henri Verbeet 2017-08-28 20:05:18 +02:00
parent e228d776be
commit 7e5af314f1
3 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libs/vkd3d/command.c
View File

@ -3075,32 +3075,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsC
FIXME("iface %p, resource %p, region %p stub!\n", iface, resource, region); FIXME("iface %p, resource %p, region %p stub!\n", iface, resource, region);
} }
static D3D12_QUERY_HEAP_TYPE vkd3d_query_heap_type_from_query_type(D3D12_QUERY_TYPE type)
{
switch (type)
{
case D3D12_QUERY_TYPE_OCCLUSION:
case D3D12_QUERY_TYPE_BINARY_OCCLUSION:
return D3D12_QUERY_HEAP_TYPE_OCCLUSION;
case D3D12_QUERY_TYPE_TIMESTAMP:
return D3D12_QUERY_HEAP_TYPE_TIMESTAMP;
case D3D12_QUERY_TYPE_PIPELINE_STATISTICS:
return D3D12_QUERY_HEAP_TYPE_PIPELINE_STATISTICS;
case D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0:
case D3D12_QUERY_TYPE_SO_STATISTICS_STREAM1:
case D3D12_QUERY_TYPE_SO_STATISTICS_STREAM2:
case D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3:
return D3D12_QUERY_HEAP_TYPE_SO_STATISTICS;
default:
WARN("Invalid query type %#x.\n", type);
return (D3D12_QUERY_HEAP_TYPE)-1;
}
}
static UINT64 vkd3d_query_type_result_size(D3D12_QUERY_TYPE type) static UINT64 vkd3d_query_type_result_size(D3D12_QUERY_TYPE type)
{ {
switch (type) switch (type)
@ -3132,12 +3106,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsComman
TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index); TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index);
if (query_heap->desc.Type != vkd3d_query_heap_type_from_query_type(type))
{
WARN("Query type %u not supported by query heap.\n", type);
return;
}
switch (type) switch (type)
{ {
case D3D12_QUERY_TYPE_TIMESTAMP: case D3D12_QUERY_TYPE_TIMESTAMP:
@ -3168,12 +3136,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandL
TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index); TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index);
if (query_heap->desc.Type != vkd3d_query_heap_type_from_query_type(type))
{
WARN("Query type %u not supported by query heap.\n", type);
return;
}
switch (type) switch (type)
{ {
case D3D12_QUERY_TYPE_TIMESTAMP: case D3D12_QUERY_TYPE_TIMESTAMP:
@ -3210,32 +3172,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics
iface, heap, type, start_index, query_count, iface, heap, type, start_index, query_count,
dst_buffer, aligned_dst_buffer_offset); dst_buffer, aligned_dst_buffer_offset);
if (query_heap->desc.Type != vkd3d_query_heap_type_from_query_type(type))
{
WARN("Query type %u not supported by query heap.\n", type);
return;
}
if ((start_index + query_count) > query_heap->desc.Count)
{
WARN("Query indices out of range (%u + %u > %u).\n", start_index, query_count, query_heap->desc.Count);
return;
}
if ((aligned_dst_buffer_offset % 8) != 0)
{
WARN("Buffer offset is not a multiple of eight (%"PRIu64".\n", aligned_dst_buffer_offset);
return;
}
if (buffer->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER) if (buffer->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER)
{ {
WARN("Destination resource is not a buffer.\n"); WARN("Destination resource is not a buffer.\n");
return; return;
} }
if ((aligned_dst_buffer_offset + vkd3d_query_type_result_size(type)) > buffer->desc.Width)
{
WARN("Would overflow destination buffer (%"PRIu64" + %"PRIu64" > %"PRIu64").\n",
aligned_dst_buffer_offset, vkd3d_query_type_result_size(type), buffer->desc.Width);
return;
}
switch (type) switch (type)
{ {

1
libs/vkd3d/resource.c
View File

@ -1740,7 +1740,6 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H
object->ID3D12QueryHeap_iface.lpVtbl = &d3d12_query_heap_vtbl; object->ID3D12QueryHeap_iface.lpVtbl = &d3d12_query_heap_vtbl;
object->refcount = 1; object->refcount = 1;
object->device = device; object->device = device;
object->desc = *desc;
pool_info.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO; pool_info.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
pool_info.pNext = NULL; pool_info.pNext = NULL;

2
libs/vkd3d/vkd3d_private.h
View File

@ -258,8 +258,6 @@ struct d3d12_query_heap
ID3D12QueryHeap ID3D12QueryHeap_iface; ID3D12QueryHeap ID3D12QueryHeap_iface;
LONG refcount; LONG refcount;
D3D12_QUERY_HEAP_DESC desc;
VkQueryPool vk_query_pool; VkQueryPool vk_query_pool;
struct d3d12_device *device; struct d3d12_device *device;