blender
/
blender
133
398
Fork 578
Code Issues 6.3k Pull Requests 744 Projects 19 Wiki Activity

WIP: Vulkan: Workbench #107886

Closed
Jeroen Bakker wants to merge 88 commits from Jeroen-Bakker:vulkan-draw-manager-workbench into main
pull from: Jeroen-Bakker:vulkan-draw-manager-workbench
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 88 Files Changed 20 +10 -7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8edef9da7c - Show all commits

17
source/blender/gpu/vulkan/vk_vertex_buffer.cc
View File

@ -47,6 +47,16 @@ void VKVertexBuffer::bind_as_texture(uint binding)
void VKVertexBuffer::bind(uint binding)
{
VKContext &context = *VKContext::get();
VKShader *shader = static_cast<VKShader *>(context.shader);
const VKShaderInterface &shader_interface = shader->interface_get();
const std::optional<VKDescriptorSet::Location> location =
shader_interface.descriptor_set_location(
shader::ShaderCreateInfo::Resource::BindType::SAMPLER, binding);
if (!location) {
return;
}
upload_data();
if (vk_buffer_view_ == VK_NULL_HANDLE) {
@ -64,13 +74,6 @@ void VKVertexBuffer::bind(uint binding)
device.device_get(), &buffer_view_info, vk_allocation_callbacks, &vk_buffer_view_);
}
VKContext &context = *VKContext::get();
VKShader *shader = static_cast<VKShader *>(context.shader);
const VKShaderInterface &shader_interface = shader->interface_get();
const std::optional<VKDescriptorSet::Location> location =
shader_interface.descriptor_set_location(
shader::ShaderCreateInfo::Resource::BindType::SAMPLER, binding);
BLI_assert_msg(location, "Locations to Texel buffers should always exist.");
shader->pipeline_get().descriptor_set_get().bind(*this, *location);
}