vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace vk::QueueFamilyIgnored with VK_QUEUE_FAMILY_IGNORED to support more Vulkan header versions

Browse source
This commit is contained in:
0cc4m 2023-08-11 05:29:26 +02:00
parent e660943d3d
commit a07f603a3e
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ggml-vulkan.cpp
View file

@ -531,7 +531,7 @@ static vk_buffer ggml_vk_create_buffer(size_t size, vk::MemoryPropertyFlags req_
buf.sb_write = nullptr; buf.sb_write = nullptr;
buf.sb_read = nullptr; buf.sb_read = nullptr;
buf.qf_owner = vk::QueueFamilyIgnored; buf.qf_owner = VK_QUEUE_FAMILY_IGNORED;
return buf; return buf;
} }
@ -550,14 +550,14 @@ static void ggml_vk_sync_buffers(vk::CommandBuffer& cmd_buffer, std::vector<vk_s
uint32_t dfi; uint32_t dfi;
for (auto& buf : buffers) { for (auto& buf : buffers) {
if (buf.buffer.qf_owner != vk::QueueFamilyIgnored && buf.buffer.qf_owner != q.queue_family_index) { if (buf.buffer.qf_owner != VK_QUEUE_FAMILY_IGNORED && buf.buffer.qf_owner != q.queue_family_index) {
sfi = buf.buffer.qf_owner; sfi = buf.buffer.qf_owner;
dfi = q.queue_family_index; dfi = q.queue_family_index;
buf.buffer.qf_owner = dfi; buf.buffer.qf_owner = dfi;
bmem_barriers.push_back({ src_mask, dst_mask, sfi, dfi, buf.buffer.buffer, buf.offset, buf.size }); bmem_barriers.push_back({ src_mask, dst_mask, sfi, dfi, buf.buffer.buffer, buf.offset, buf.size });
} else if (force_sync) { } else if (force_sync) {
sfi = vk::QueueFamilyIgnored; sfi = VK_QUEUE_FAMILY_IGNORED;
dfi = vk::QueueFamilyIgnored; dfi = VK_QUEUE_FAMILY_IGNORED;
bmem_barriers.push_back({ src_mask, dst_mask, sfi, dfi, buf.buffer.buffer, buf.offset, buf.size }); bmem_barriers.push_back({ src_mask, dst_mask, sfi, dfi, buf.buffer.buffer, buf.offset, buf.size });
} }
} }
@ -1230,7 +1230,7 @@ static vk_sequence ggml_vk_buffer_write_2d_async_zeropad(vk_buffer* dst, size_t
{}, {},
{}, {},
{ {
{ vk::AccessFlagBits::eMemoryWrite, vk::AccessFlagBits::eMemoryWrite, vk::QueueFamilyIgnored, vk::QueueFamilyIgnored, dst->buffer, 0, VK_WHOLE_SIZE } { vk::AccessFlagBits::eMemoryWrite, vk::AccessFlagBits::eMemoryWrite, VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, dst->buffer, 0, VK_WHOLE_SIZE }
}, },
{} {}
); );