From 1a263b377c1558fe4617a443687334655366c522 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 12 Sep 2018 17:02:57 -0500 Subject: [PATCH] anv: Silence a couple compiler warnings [63/93] Compiling C object 'src/intel/vulkan/...intel@vulkan@@anv_common@sta/anv_device.c.o'. ../src/intel/vulkan/anv_device.c:685:30: warning: passing 'const char *' to parameter of type 'void *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers] vk_free(&instance->alloc, instance->app_info.app_name); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/vulkan/util/vk_alloc.h:62:51: note: passing argument to parameter 'data' here vk_free(const VkAllocationCallbacks *alloc, void *data) ^ ../src/intel/vulkan/anv_device.c:686:30: warning: passing 'const char *' to parameter of type 'void *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers] vk_free(&instance->alloc, instance->app_info.engine_name); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/vulkan/util/vk_alloc.h:62:51: note: passing argument to parameter 'data' here vk_free(const VkAllocationCallbacks *alloc, void *data) ^ [65/93] Compiling C object 'src/intel/vulkan/...ommon@sta/anv_nir_apply_pipeline_layout.c.o'. ../src/intel/vulkan/anv_nir_apply_pipeline_layout.c:519:13: warning: unused variable 'image_uniform' [-Wunused-variable] unsigned image_uniform; Reviewed-by: Ian Romanick --- src/intel/vulkan/anv_device.c | 4 ++-- src/intel/vulkan/anv_nir_apply_pipeline_layout.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 1e37876eb43..4219a073d2d 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -682,8 +682,8 @@ void anv_DestroyInstance( anv_physical_device_finish(&instance->physicalDevice); } - vk_free(&instance->alloc, instance->app_info.app_name); - vk_free(&instance->alloc, instance->app_info.engine_name); + vk_free(&instance->alloc, (char *)instance->app_info.app_name); + vk_free(&instance->alloc, (char *)instance->app_info.engine_name); VG(VALGRIND_DESTROY_MEMPOOL(instance)); diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c index 856101cc2ff..6868288e486 100644 --- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c @@ -516,7 +516,6 @@ anv_nir_apply_pipeline_layout(struct anv_pipeline *pipeline, } } - unsigned image_uniform; if (map->image_count > 0) { assert(map->image_count <= MAX_IMAGES); assert(shader->num_uniforms == prog_data->nr_params * 4); -- 2.30.2