Skip to content

radv: Avoid call vulkan functions directly in radix_sort

Yonggang Luo requested to merge lygstate/mesa:radv_radix_sort_fix into main

Fixes the folowing error:

[3/3] Linking target src/amd/vulkan/libvulkan_radeon.dll
FAILED: src/amd/vulkan/libvulkan_radeon.dll
"c++" @src/amd/vulkan/libvulkan_radeon.dll.rsp
C:/CI-Tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: src/amd/vulkan/libvulkan_radeon.dll.p/radix_sort_radix_sort_vk.c.obj: in function `rs_get_devaddr':
C:\work\xemu\xemu-opengl\mesa\build\windows-mingw64/../../src/amd/vulkan/radix_sort/radix_sort_vk.c:432: undefined reference to `vkGetBufferDeviceAddress'
C:/CI-Tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: src/amd/vulkan/libvulkan_radeon.dll.p/radix_sort_radix_sort_vk.c.obj: in function `radix_sort_vk_fill_buffer':
C:\work\xemu\xemu-opengl\mesa\build\windows-mingw64/../../src/amd/vulkan/radix_sort/radix_sort_vk.c:1159: undefined reference to `vkCmdFillBuffer'
C:/CI-Tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: src/amd/vulkan/libvulkan_radeon.dll.p/radix_sort_radix_sort_vk.c.obj: in function `radix_sort_vk_dispatch_indirect':
C:\work\xemu\xemu-opengl\mesa\build\windows-mingw64/../../src/amd/vulkan/radix_sort/radix_sort_vk.c:1203: undefined reference to `vkCmdDispatchIndirect'
collect2.exe: error: ld returned 1 exit status
ninja: build stopped: cannot make progress due to previous errors.

Also format the code as it's conflicting with the src/amd/.clang-format file

Edited by Yonggang Luo

Merge request reports