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

radv/meta_decompress: fix pointer to integer conversion

Browse Source 
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>
This commit is contained in:
Mauro Rossi
2018-08-14 21:10:54 +02:00
parent 73b342c7a5
commit 43318d5857
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/vulkan/radv_meta_decompress.c
View File

@@ -362,7 +362,7 @@ static void radv_process_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
return; return;
if (!meta_state->depth_decomp[samples_log2].decompress_pipeline) { 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].pass,
meta_state->depth_decomp[samples_log2].p_layout, meta_state->depth_decomp[samples_log2].p_layout,
&meta_state->depth_decomp[samples_log2].decompress_pipeline, &meta_state->depth_decomp[samples_log2].decompress_pipeline,