diff options
| author | Mauro Rossi <[email protected]> | 2018-08-14 21:10:54 +0200 |
|---|---|---|
| committer | Mauro Rossi <[email protected]> | 2018-08-15 14:34:50 +0200 |
| commit | 43318d5857bd41981eb8a201982430f676e092c5 (patch) | |
| tree | bea16f7ad0558f469eb972c0d2f6a98b7ff3d894 | |
| parent | 73b342c7a52a93d283799800824311639f372de0 (diff) | |
radv/meta_decompress: fix pointer to integer conversion
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 <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_meta_decompress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/amd/vulkan/radv_meta_decompress.c b/src/amd/vulkan/radv_meta_decompress.c index 41ed7b6d043..b4f568ba2f8 100644 --- a/src/amd/vulkan/radv_meta_decompress.c +++ b/src/amd/vulkan/radv_meta_decompress.c @@ -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) { - 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, |