mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libs/vkd3d: Use PRIx64 to print 64-bit integers.

This commit is contained in:
Józef Kucia 2016-10-10 11:22:50 +02:00
parent 6330c9f46a
commit 59d466af2d
5 changed files with 56 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/private/vkd3d_debug.h
View File

@ -59,14 +59,6 @@ const char *debugstr_w(const WCHAR *wstr) DECLSPEC_HIDDEN;
#define FIXME VKD3D_DBG_LOG(FIXME)
#define ERR VKD3D_DBG_LOG(ERR)
static inline const char *debugstr_uint64(UINT64 v)
{
if ((v >> 32) && sizeof(unsigned long) < sizeof(v))
return vkd3d_dbg_sprintf("%#lx%08lx", (unsigned long)(v >> 32), (unsigned long)v);
return vkd3d_dbg_sprintf("%#lx", (unsigned long)v);
}
static inline const char *debugstr_guid(const GUID *guid)
{
if (!guid)

74
libs/vkd3d/command.c
View File

@ -29,7 +29,7 @@ static HRESULT vkd3d_queue_gpu_fence(struct vkd3d_fence_worker *worker,
{
int rc;
TRACE("worker %p, fence %p, value %s.\n", worker, fence, debugstr_uint64(value));
TRACE("worker %p, fence %p, value %#"PRIx64".\n", worker, fence, value);
if ((rc = pthread_mutex_lock(&worker->mutex)))
{
@ -347,7 +347,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
unsigned int i;
int rc;
TRACE("iface %p, value %s, event %p.\n", iface, debugstr_uint64(value), event);
TRACE("iface %p, value %#"PRIx64", event %p.\n", iface, value, event);
if ((rc = pthread_mutex_lock(&fence->mutex)))
{
@ -367,8 +367,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
struct vkd3d_waiting_event *current = &fence->events[i];
if (current->value == value && current->event == event)
{
WARN("Event completion for (%p, %s) is already in the list.\n",
event, debugstr_uint64(value));
WARN("Event completion for (%p, %#"PRIx64") is already in the list.\n",
event, value);
pthread_mutex_unlock(&fence->mutex);
return S_OK;
}
@ -396,7 +396,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_Signal(ID3D12Fence *iface, UINT64 v
unsigned int i, j;
int rc;
TRACE("iface %p, value %s.\n", iface, debugstr_uint64(value));
TRACE("iface %p, value %#"PRIx64".\n", iface, value);
if ((rc = pthread_mutex_lock(&fence->mutex)))
{
@ -1090,9 +1090,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12Graphics
const struct vkd3d_vk_device_procs *vk_procs;
VkBufferCopy buffer_copy;
TRACE("iface %p, dst_resource %p, dst_offset %s, src_resource %p, src_offset %s, byte_count %s.\n",
iface, dst_resource, debugstr_uint64(dst_offset), src_resource,
debugstr_uint64(src_offset), debugstr_uint64(byte_count));
TRACE("iface %p, dst_resource %p, dst_offset %#"PRIx64", src_resource %p, "
"src_offset %#"PRIx64", byte_count %#"PRIx64".\n",
iface, dst_resource, dst_offset, src_resource, src_offset, byte_count);
vk_procs = &list->device->vk_procs;
@ -1174,9 +1174,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTiles(ID3D12GraphicsCommand
D3D12_TILE_COPY_FLAGS flags)
{
FIXME("iface %p, tiled_resource %p, tile_region_start_coordinate %p, tile_region_size %p, "
"buffer %p, buffer_offset %s, flags %#x stub!\n",
"buffer %p, buffer_offset %#"PRIx64", flags %#x stub!\n",
iface, tiled_resource, tile_region_start_coordinate, tile_region_size,
buffer, debugstr_uint64(buffer_offset), flags);
buffer, buffer_offset, flags);
}
static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12GraphicsCommandList *iface,
@ -1289,15 +1289,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList *iface,
UINT root_parameter_index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor)
{
FIXME("iface %p, root_parameter_index %u, base_descriptor %s stub!\n",
iface, root_parameter_index, debugstr_uint64(base_descriptor.ptr));
FIXME("iface %p, root_parameter_index %u, base_descriptor %#"PRIx64" stub!\n",
iface, root_parameter_index, base_descriptor.ptr);
}
static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootDescriptorTable(ID3D12GraphicsCommandList *iface,
UINT root_parameter_index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor)
{
FIXME("iface %p, root_parameter_index %u, base_descriptor %s stub!\n",
iface, root_parameter_index, debugstr_uint64(base_descriptor.ptr));
FIXME("iface %p, root_parameter_index %u, base_descriptor %#"PRIx64" stub!\n",
iface, root_parameter_index, base_descriptor.ptr);
}
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstant(ID3D12GraphicsCommandList *iface,
@ -1331,43 +1331,43 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstants(I
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootConstantBufferView(
ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
FIXME("iface %p, root_parameter_index %u, address %s stub!\n",
iface, root_parameter_index, debugstr_uint64(address));
FIXME("iface %p, root_parameter_index %u, address %#"PRIx64" stub!\n",
iface, root_parameter_index, address);
}
static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootConstantBufferView(
ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
FIXME("iface %p, root_parameter_index %u, address %s stub!\n",
iface, root_parameter_index, debugstr_uint64(address));
FIXME("iface %p, root_parameter_index %u, address %#"PRIx64" stub!\n",
iface, root_parameter_index, address);
}
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootShaderResourceView(
ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
FIXME("iface %p, root_parameter_index %u, address %s stub!\n",
iface, root_parameter_index, debugstr_uint64(address));
FIXME("iface %p, root_parameter_index %u, address %#"PRIx64" stub!\n",
iface, root_parameter_index, address);
}
static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootShaderResourceView(
ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
FIXME("iface %p, root_parameter_index %u, address %s stub!\n",
iface, root_parameter_index, debugstr_uint64(address));
FIXME("iface %p, root_parameter_index %u, address %#"PRIx64" stub!\n",
iface, root_parameter_index, address);
}
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootUnorderedAccessView(
ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
FIXME("iface %p, root_parameter_index %u, address %s stub!\n",
iface, root_parameter_index, debugstr_uint64(address));
FIXME("iface %p, root_parameter_index %u, address %#"PRIx64" stub!\n",
iface, root_parameter_index, address);
}
static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootUnorderedAccessView(
ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address)
{
FIXME("iface %p, root_parameter_index %u, address %s stub!\n",
iface, root_parameter_index, debugstr_uint64(address));
FIXME("iface %p, root_parameter_index %u, address %#"PRIx64" stub!\n",
iface, root_parameter_index, address);
}
static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12GraphicsCommandList *iface,
@ -1531,8 +1531,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I
D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle,
ID3D12Resource *resource, UINT rect_count, const D3D12_RECT *rects)
{
FIXME("iface %p, gpu_handle %s, cpu_handle %lx, resource %p, rect_count %u, rects %p stub!\n",
iface, debugstr_uint64(gpu_handle.ptr), cpu_handle.ptr, resource, rect_count, rects);
FIXME("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, rect_count %u, rects %p stub!\n",
iface, gpu_handle.ptr, cpu_handle.ptr, resource, rect_count, rects);
}
static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsCommandList *iface,
@ -1558,16 +1558,16 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics
ID3D12Resource *dst_buffer, UINT64 aligned_dst_buffer_offset)
{
FIXME("iface %p, heap %p, type %#x, start_index %u, query_count %u, "
"dst_buffer %p, aligned_dst_buffer_offset %s stub!\n",
"dst_buffer %p, aligned_dst_buffer_offset %#"PRIx64" stub!\n",
iface, heap, type, start_index, query_count,
dst_buffer, debugstr_uint64(aligned_dst_buffer_offset));
dst_buffer, aligned_dst_buffer_offset);
}
static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList *iface,
ID3D12Resource *buffer, UINT64 aligned_buffer_offset, D3D12_PREDICATION_OP operation)
{
FIXME("iface %p, buffer %p, aligned_buffer_offset %s, operation %#x stub!\n",
iface, buffer, debugstr_uint64(aligned_buffer_offset), operation);
FIXME("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x stub!\n",
iface, buffer, aligned_buffer_offset, operation);
}
static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList *iface,
@ -1593,9 +1593,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC
UINT64 arg_buffer_offset, ID3D12Resource *count_buffer, UINT64 count_buffer_offset)
{
FIXME("iface %p, command_signature %p, max_command_count %u, arg_buffer %p, "
"arg_buffer_offset %s, count_buffer %p, count_buffer_offset %s stub!\n",
iface, command_signature, max_command_count, arg_buffer, debugstr_uint64(arg_buffer_offset),
count_buffer, debugstr_uint64(count_buffer_offset));
"arg_buffer_offset %#"PRIx64", count_buffer %p, count_buffer_offset %#"PRIx64" stub!\n",
iface, command_signature, max_command_count, arg_buffer, arg_buffer_offset,
count_buffer, count_buffer_offset);
}
static const struct ID3D12GraphicsCommandListVtbl d3d12_command_list_vtbl =
@ -1948,7 +1948,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *
VkFence vk_fence;
VkResult vr;
TRACE("iface %p, fence %p, value %s.\n", iface, fence, debugstr_uint64(value));
TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence, value);
device = command_queue->device;
vk_procs = &device->vk_procs;
@ -1990,7 +1990,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *
static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *iface,
ID3D12Fence *fence, UINT64 value)
{
FIXME("iface %p, fence %p, value %s stub!\n", iface, fence, debugstr_uint64(value));
FIXME("iface %p, fence %p, value %#"PRIx64" stub!\n", iface, fence, value);
return E_NOTIMPL;
}

35
libs/vkd3d/device.c
View File

@ -116,9 +116,8 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device,
for (i = 0; i < memory_properties.memoryHeapCount; ++i)
{
const VkMemoryHeap *heap = &memory_properties.memoryHeaps[i];
TRACE("Memory heap [%u]: size %s (%lu MiB), flags %s, memory types:\n",
i, debugstr_uint64(heap->size), (unsigned long)(heap->size / 1024 / 1024),
debug_vk_memory_heap_flags(heap->flags));
TRACE("Memory heap [%u]: size %#"PRIx64" (%"PRIu64" MiB), flags %s, memory types:\n",
i, heap->size, heap->size / 1024 / 1024, debug_vk_memory_heap_flags(heap->flags));
for (j = 0; j < memory_properties.memoryTypeCount; ++j)
{
const VkMemoryType *type = &memory_properties.memoryTypes[j];
@ -141,8 +140,8 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device,
TRACE(" maxPushConstantsSize: %u.\n", limits->maxPushConstantsSize);
TRACE(" maxMemoryAllocationCount: %u.\n", limits->maxMemoryAllocationCount);
TRACE(" maxSamplerAllocationCount: %u.\n", limits->maxSamplerAllocationCount);
TRACE(" bufferImageGranularity: %s.\n", debugstr_uint64(limits->bufferImageGranularity));
TRACE(" sparseAddressSpaceSize: %s.\n", debugstr_uint64(limits->sparseAddressSpaceSize));
TRACE(" bufferImageGranularity: %#"PRIx64".\n", limits->bufferImageGranularity);
TRACE(" sparseAddressSpaceSize: %#"PRIx64".\n", limits->sparseAddressSpaceSize);
TRACE(" maxBoundDescriptorSets: %u.\n", limits->maxBoundDescriptorSets);
TRACE(" maxPerStageDescriptorSamplers: %u.\n", limits->maxPerStageDescriptorSamplers);
TRACE(" maxPerStageDescriptorUniformBuffers: %u.\n", limits->maxPerStageDescriptorUniformBuffers);
@ -206,9 +205,9 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device,
TRACE(" viewportBoundsRange: %f, %f.\n", limits->viewportBoundsRange[0], limits->viewportBoundsRange[1]);
TRACE(" viewportSubPixelBits: %u.\n", limits->viewportSubPixelBits);
TRACE(" minMemoryMapAlignment: %u.\n", (unsigned int)limits->minMemoryMapAlignment);
TRACE(" minTexelBufferOffsetAlignment: %s.\n", debugstr_uint64(limits->minTexelBufferOffsetAlignment));
TRACE(" minUniformBufferOffsetAlignment: %s.\n", debugstr_uint64(limits->minUniformBufferOffsetAlignment));
TRACE(" minStorageBufferOffsetAlignment: %s.\n", debugstr_uint64(limits->minStorageBufferOffsetAlignment));
TRACE(" minTexelBufferOffsetAlignment: %#"PRIx64".\n", limits->minTexelBufferOffsetAlignment);
TRACE(" minUniformBufferOffsetAlignment: %#"PRIx64".\n", limits->minUniformBufferOffsetAlignment);
TRACE(" minStorageBufferOffsetAlignment: %#"PRIx64".\n", limits->minStorageBufferOffsetAlignment);
TRACE(" minTexelOffset: %d.\n", limits->minTexelOffset);
TRACE(" maxTexelOffset: %u.\n", limits->maxTexelOffset);
TRACE(" minTexelGatherOffset: %d.\n", limits->minTexelGatherOffset);
@ -242,11 +241,9 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device,
TRACE(" lineWidthGranularity: %f.\n", limits->lineWidthGranularity);
TRACE(" strictLines: %#x.\n", limits->strictLines);
TRACE(" standardSampleLocations: %#x.\n", limits->standardSampleLocations);
TRACE(" optimalBufferCopyOffsetAlignment: %s.\n",
debugstr_uint64(limits->optimalBufferCopyOffsetAlignment));
TRACE(" optimalBufferCopyRowPitchAlignment: %s.\n",
debugstr_uint64(limits->optimalBufferCopyRowPitchAlignment));
TRACE(" nonCoherentAtomSize: %s.\n", debugstr_uint64(limits->nonCoherentAtomSize));
TRACE(" optimalBufferCopyOffsetAlignment: %#"PRIx64".\n", limits->optimalBufferCopyOffsetAlignment);
TRACE(" optimalBufferCopyRowPitchAlignment: %#"PRIx64".\n", limits->optimalBufferCopyRowPitchAlignment);
TRACE(" nonCoherentAtomSize: %#"PRIx64".\n", limits->nonCoherentAtomSize);
VK_CALL(vkGetPhysicalDeviceFeatures(device, &features));
TRACE("Device features:\n");
@ -868,9 +865,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource(ID3D12Device
const D3D12_CLEAR_VALUE *optimized_clear_value,
REFIID riid, void **resource)
{
FIXME("iface %p, heap %p, heap_offset %s, desc %p, initial_state %#x, "
FIXME("iface %p, heap %p, heap_offset %#"PRIx64", desc %p, initial_state %#x, "
"optimized_clear_value %p, riid %s, resource %p stub!\n",
iface, heap, debugstr_uint64(heap_offset), desc, initial_state,
iface, heap, heap_offset, desc, initial_state,
optimized_clear_value, debugstr_guid(riid), resource);
return E_NOTIMPL;
@ -941,8 +938,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device *iface,
struct d3d12_fence *object;
HRESULT hr;
TRACE("iface %p, intial_value %s, flags %#x, riid %s, fence %p.\n",
iface, debugstr_uint64(initial_value), flags, debugstr_guid(riid), fence);
TRACE("iface %p, intial_value %#"PRIx64", flags %#x, riid %s, fence %p.\n",
iface, initial_value, flags, debugstr_guid(riid), fence);
if (FAILED(hr = d3d12_fence_create(device, initial_value, flags, &object)))
return hr;
@ -968,9 +965,9 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i
UINT64 *row_size,
UINT64 *total_bytes)
{
FIXME("iface %p, desc %p, first_sub_resource %u, sub_resource_count %u, base_offset %s, "
FIXME("iface %p, desc %p, first_sub_resource %u, sub_resource_count %u, base_offset %#"PRIx64", "
"layouts %p, row_count %p, row_size %p, total_bytes %p stub!\n",
iface, desc, first_sub_resource, sub_resource_count, debugstr_uint64(base_offset), layouts,
iface, desc, first_sub_resource, sub_resource_count, base_offset, layouts,
row_count, row_size, total_bytes);
}

5
libs/vkd3d/resource.c
View File

@ -239,9 +239,8 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device,
VkMemoryAllocateInfo allocate_info;
VkResult vr;
TRACE("Memory requirements: size %s, alignment %s.\n",
debugstr_uint64(memory_requirements->size),
debugstr_uint64(memory_requirements->alignment));
TRACE("Memory requirements: size %#"PRIx64", alignment %#"PRIx64".\n",
memory_requirements->size, memory_requirements->alignment);
allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
allocate_info.pNext = NULL;

1
libs/vkd3d/vkd3d_private.h
View File

@ -30,6 +30,7 @@
#include "vkd3d_vulkan.h"
#include <assert.h>
#include <inttypes.h>
#include <pthread.h>
#include <stdbool.h>