OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: Fix 32-bit build for the new overlay layer

Browse Source 
vulkan_core.h defines non-dispatchable handles as (struct object *)
on 64-bit systems, but uint64_t on 32-bit systems.  The former can be
implicitly cast to void *, but the latter requires an explicit cast.

While here, %lu is the wrong format specifier for uint64_t on 32-bit
systems, so use PRIu64, fixing a warning.

Reported-by: Mike Lothian <mike@fireburn.co.uk>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Kenneth Graunke
2019-02-21 19:07:29 -08:00
parent 4f917e6a61
commit 3090c6b9e9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vulkan/overlay-layer/overlay.cpp
View File

@@ -382,13 +382,13 @@ static struct swapchain_data *new_swapchain_data(VkSwapchainKHR swapchain,
data->device = device_data; data->device = device_data;
data->swapchain = swapchain; data->swapchain = swapchain;
data->window_size = ImVec2(300, 300); data->window_size = ImVec2(300, 300);
map_object(data->swapchain, data); map_object((void *) data->swapchain, data);
return data; return data;
} }
static void destroy_swapchain_data(struct swapchain_data *data) static void destroy_swapchain_data(struct swapchain_data *data)
{ {
unmap_object(data->swapchain); unmap_object((void *) data->swapchain);
ralloc_free(data); ralloc_free(data);
} }
@@ -490,7 +490,7 @@ static void compute_swapchain_display(struct swapchain_data *data)
const char *format_name = vk_Format_to_str(data->format); const char *format_name = vk_Format_to_str(data->format);
format_name = format_name ? (format_name + strlen("VK_FORMAT_")) : "unknown"; format_name = format_name ? (format_name + strlen("VK_FORMAT_")) : "unknown";
ImGui::Text("Swapchain format: %s", format_name); ImGui::Text("Swapchain format: %s", format_name);
ImGui::Text("Frames: %lu", data->n_frames); ImGui::Text("Frames: %" PRIu64, data->n_frames);
{ {
double min_time = FLT_MAX, max_time = 0.0f; double min_time = FLT_MAX, max_time = 0.0f;