radv/meta_decompress: fix pointer to integer conversion
authorMauro Rossi <issor.oruam@gmail.com>
Tue, 14 Aug 2018 19:10:54 +0000 (21:10 +0200)
committerMauro Rossi <issor.oruam@gmail.com>
Wed, 15 Aug 2018 12:34:50 +0000 (14:34 +0200)
VK_NULL_HANDLE replaces NULL to avoid following building error:

external/mesa/src/amd/vulkan/radv_meta_decompress.c:365:54: error:
incompatible pointer to integer conversion passing 'void *' to parameter
of type 'VkShaderModule' (aka 'unsigned long long') [-Werror,-Wint-conversion]
                VkResult ret = create_pipeline(cmd_buffer->device, NULL, samples,
                                                                   ^~~~
prebuilts/clang/host/linux-x86/clang-4053586/lib64/clang/5.0.300080/include/stddef.h:105:16:
note: expanded from macro 'NULL'
#  define NULL ((void*)0)
               ^~~~~~~~~~
external/mesa/src/amd/vulkan/radv_meta_decompress.c:97:32:
note: passing argument to parameter 'vs_module_h' here
                VkShaderModule vs_module_h,
                               ^
1 error generated.

Fixes: fbcd167314 ("radv: Add on-demand compilation of built-in shaders.")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
src/amd/vulkan/radv_meta_decompress.c

index 41ed7b6d043f89a23da551c3ec53164296beb248..b4f568ba2f83704b19ba71c79b86555d3b9552a9 100644 (file)
@@ -362,7 +362,7 @@ static void radv_process_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
                return;
 
        if (!meta_state->depth_decomp[samples_log2].decompress_pipeline) {
                return;
 
        if (!meta_state->depth_decomp[samples_log2].decompress_pipeline) {
-               VkResult ret = create_pipeline(cmd_buffer->device, NULL, samples,
+               VkResult ret = create_pipeline(cmd_buffer->device, VK_NULL_HANDLE, samples,
                                               meta_state->depth_decomp[samples_log2].pass,
                                               meta_state->depth_decomp[samples_log2].p_layout,
                                               &meta_state->depth_decomp[samples_log2].decompress_pipeline,
                                               meta_state->depth_decomp[samples_log2].pass,
                                               meta_state->depth_decomp[samples_log2].p_layout,
                                               &meta_state->depth_decomp[samples_log2].decompress_pipeline,