Skip to content

Commit

Permalink
vkd3d: Fix some format warnings.
Browse files Browse the repository at this point in the history
Signed-off-by: Krzysztof Bogacki <[email protected]>
  • Loading branch information
Saancreed committed Aug 22, 2024
1 parent 945b32c commit 59b0c4d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions libs/vkd3d/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -4788,8 +4788,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(d3d12_device_i
}

TRACE("input_data_size = %zu, input_data = %p, output_data_size = %zu, output_data = %p.\n",
data->QueryInputDataSizeInBytes, data->pQueryInputData, data->QueryOutputDataSizeInBytes,
data->pQueryOutputData);
(size_t)data->QueryInputDataSizeInBytes, data->pQueryInputData,
(size_t)data->QueryOutputDataSizeInBytes, data->pQueryOutputData);

if ((data->QueryInputDataSizeInBytes && !data->pQueryInputData) ||
(data->QueryOutputDataSizeInBytes && !data->pQueryOutputData))
Expand All @@ -4807,7 +4807,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(d3d12_device_i
if (data->QueryInputDataSizeInBytes < sizeof(*in_args) || data->QueryOutputDataSizeInBytes < sizeof(*out_args))
{
FIXME("Unexpected input/output sizes for DirectStorage meta command: %zu, %zu.\n",
data->QueryInputDataSizeInBytes, data->QueryOutputDataSizeInBytes);
(size_t)data->QueryInputDataSizeInBytes, (size_t)data->QueryOutputDataSizeInBytes);
return E_INVALIDARG;
}

Expand Down
12 changes: 6 additions & 6 deletions libs/vkd3d/device_vkd3d_ext.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_vkd3d_ext_GetCudaTextureObject(d3d
struct d3d12_device *device;

TRACE("iface %p, srv_handle %zu, sampler_handle %zu, cuda_texture_handle %p.\n",
iface, srv_handle.ptr, sampler_handle.ptr, cuda_texture_handle);
iface, (size_t)srv_handle.ptr, (size_t)sampler_handle.ptr, cuda_texture_handle);

if (!cuda_texture_handle)
return E_INVALIDARG;
Expand All @@ -188,7 +188,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_vkd3d_ext_GetCudaSurfaceObject(d3d
struct d3d12_desc_split uav_desc;
struct d3d12_device *device;

TRACE("iface %p, uav_handle %zu, cuda_surface_handle %p.\n", iface, uav_handle.ptr, cuda_surface_handle);
TRACE("iface %p, uav_handle %zu, cuda_surface_handle %p.\n", iface, (size_t)uav_handle.ptr, cuda_surface_handle);
if (!cuda_surface_handle)
return E_INVALIDARG;

Expand Down Expand Up @@ -453,8 +453,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_dxvk_interop_device_CreateInteropCommandQ
struct d3d12_command_queue *object;
HRESULT hr;

TRACE("iface %p, desc %p, vk_family %d, command_queue %p.\n",
iface, desc, command_queue);
TRACE("iface %p, desc %p, vk_family_index %"PRIu32", command_queue %p.\n",
iface, desc, vk_family_index, command_queue);

hr = d3d12_command_queue_create(device, desc, vk_family_index, &object);
if (FAILED(hr))
Expand All @@ -472,8 +472,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_dxvk_interop_device_CreateInteropCommandA
struct d3d12_command_allocator *object;
HRESULT hr;

TRACE("iface %p, type %x, vk_family %d, command_allocator %p.\n",
iface, type, command_allocator);
TRACE("iface %p, type %x, vk_family_index %"PRIu32", command_allocator %p.\n",
iface, type, vk_family_index, command_allocator);

hr = d3d12_command_allocator_create(device, type, vk_family_index, &object);
if (FAILED(hr))
Expand Down
6 changes: 3 additions & 3 deletions libs/vkd3d/resource.c
Original file line number Diff line number Diff line change
Expand Up @@ -2213,7 +2213,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(d3d12_resourc
extent.depth = dst_box->back - dst_box->front;

subresource_layout = &resource->subresource_layouts[dst_sub_resource];
TRACE("Offset %#"PRIx64", row pitch %#"PRIx64", depth pitch %#"PRIx64".\n",
TRACE("Offset %#zx, row pitch %#zx, depth pitch %#zx.\n",
subresource_layout->offset, subresource_layout->row_pitch, subresource_layout->depth_pitch);

d3d12_resource_get_map_ptr(resource, (void **)&dst_data);
Expand Down Expand Up @@ -2284,7 +2284,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(d3d12_resour
}

subresource_layout = &resource->subresource_layouts[src_sub_resource];
TRACE("Offset %#"PRIx64", row pitch %#"PRIx64", depth pitch %#"PRIx64".\n",
TRACE("Offset %#zx, row pitch %#zx, depth pitch %#zx.\n",
subresource_layout->offset, subresource_layout->row_pitch, subresource_layout->depth_pitch);

d3d12_resource_get_map_ptr(resource, (void **)&src_data);
Expand Down Expand Up @@ -2802,7 +2802,7 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC1 *desc,
if ((desc->Width & ((1u << format->plane_footprints[i].subsample_x_log2) - 1u)) ||
(desc->Height & ((1u << format->plane_footprints[i].subsample_y_log2) - 1u)))
{
WARN("Image size %ux%u not a multiple of %ux%u for format %#x.\n", desc->Width, desc->Height,
WARN("Image size %"PRIu64"x%u not a multiple of %ux%u for format %#x.\n", desc->Width, desc->Height,
1u << format->plane_footprints[i].subsample_x_log2,
1u << format->plane_footprints[i].subsample_y_log2, desc->Format);
return E_INVALIDARG;
Expand Down

0 comments on commit 59b0c4d

Please sign in to comment.