blender/blender
150
479
Fork 710
Code Issues 6.8k Pull Requests 896 Projects 18 Wiki Activity

WIP: Vulkan: Initial Immediate Mode Support. #106954

Closed
Jeroen Bakker wants to merge 27 commits from Jeroen-Bakker:vulkan-immediate into main
pull from: Jeroen-Bakker:vulkan-immediate
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 27 Files Changed 41 +25 -25
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 21b49096d6 - Show all commits

6
source/blender/gpu/vulkan/vk_pipeline.cc
View File

@ -140,11 +140,9 @@ void VKPipeline::finalize(VKContext &context,
VkPipelineVertexInputStateCreateInfo vertex_input_state = {};
vertex_input_state.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
vertex_input_state.vertexBindingDescriptionCount = 0;
vertex_input_state.vertexBindingDescriptionCount =
1; // vertex_attribute_object.bindings.size();
vertex_input_state.vertexBindingDescriptionCount = vertex_attribute_object.bindings.size();
vertex_input_state.pVertexBindingDescriptions = vertex_attribute_object.bindings.data();
vertex_input_state.vertexAttributeDescriptionCount =
1; // vertex_attribute_object.attributes.size();
vertex_input_state.vertexAttributeDescriptionCount = vertex_attribute_object.attributes.size();
vertex_input_state.pVertexAttributeDescriptions = vertex_attribute_object.attributes.data();
pipeline_create_info.pVertexInputState = &vertex_input_state;

39
source/blender/gpu/vulkan/vk_vertex_attribute_object.cc
View File

@ -75,35 +75,34 @@ void VKVertexAttributeObject::bind(VKContext &context)
void VKVertexAttributeObject::update_bindings(const VKContext &context, VKBatch &batch)
{
const VKShaderInterface &interface = unwrap(context.shader)->interface_get();
AttributeMask occupied_attributes = 0;
/* Reverse order so first VBO'S have more prevalence (in term of attribute override). */
AttributeMask attribute_mask = interface.enabled_attr_mask_;
for (int v = GPU_BATCH_VBO_MAX_LEN - 1; v > -1; v--) {
for (int v = 0; v < GPU_BATCH_VBO_MAX_LEN; v++) {
VKVertexBuffer *vbo = batch.vertex_buffer_get(v);
if (vbo) {
attribute_mask &= ~update_bindings(*vbo, interface, false);
update_bindings(*vbo, interface, occupied_attributes, false);
}
}
for (int v = GPU_BATCH_INST_VBO_MAX_LEN - 1; v > -1; v--) {
for (int v = 0; v < GPU_BATCH_INST_VBO_MAX_LEN; v++) {
VKVertexBuffer *vbo = batch.instance_buffer_get(v);
if (vbo) {
attribute_mask &= ~update_bindings(*vbo, interface, true);
update_bindings(*vbo, interface, occupied_attributes, false);
}
}
BLI_assert(interface.enabled_attr_mask_ == occupied_attributes);
}
AttributeMask VKVertexAttributeObject::update_bindings(VKVertexBuffer &vertex_buffer,
const VKShaderInterface &interface,
const bool use_instancing)
void VKVertexAttributeObject::update_bindings(VKVertexBuffer &vertex_buffer,
const VKShaderInterface &interface,
AttributeMask &r_occupied_attributes,
const bool use_instancing)
{
uint enabled_attributes = 0;
const GPUVertFormat &format = vertex_buffer.format;
if (format.attr_len <= 0) {
return enabled_attributes;
return;
}
uint32_t offset = 0;
@ -129,26 +128,28 @@ AttributeMask VKVertexAttributeObject::update_bindings(VKVertexBuffer &vertex_bu
bindings.append(vk_binding_descriptor);
vbos.append(&vertex_buffer);
for (uint32_t name_index = 0; name_index <= attribute.name_len; name_index++) {
for (uint32_t name_index = 0; name_index < attribute.name_len; name_index++) {
const char *name = GPU_vertformat_attr_name_get(&format, &attribute, name_index);
const ShaderInput *shader_input = interface.attr_get(name);
if (shader_input == nullptr || shader_input->location == -1) {
continue;
}
/* Don't overwrite attributes that are already occupied. */
AttributeMask attribute_mask = 1 << shader_input->location;
if (r_occupied_attributes & attribute_mask) {
continue;
}
r_occupied_attributes |= attribute_mask;
VkVertexInputAttributeDescription attribute_description = {};
enabled_attributes |= (1 << shader_input->location);
attribute_description.binding = binding;
attribute_description.location = shader_input->location;
attribute_description.format = to_vk_format(
static_cast<GPUVertCompType>(attribute.comp_type), attribute.size);
attributes.append(attribute_description);
}
// TODO: resolving conflicting location numbers.
}
return enabled_attributes;
}
} // namespace blender::gpu

3
source/blender/gpu/vulkan/vk_vertex_attribute_object.hh
View File

@ -40,8 +40,9 @@ struct VKVertexAttributeObject {
void update_bindings(const VKContext &context, VKBatch &batch);
private:
AttributeMask update_bindings(VKVertexBuffer &vertex_buffer,
void update_bindings(VKVertexBuffer &vertex_buffer,
const VKShaderInterface &interface,
AttributeMask &r_occupied_attributes,
const bool use_instancing);
};

2
source/blender/gpu/vulkan/vk_vertex_attribute_object_cache.cc
View File

@ -169,7 +169,7 @@ VKVertexAttributeObject &VKVaoCache::lookup(const VKShaderInterface *interface)
}
}
VKVertexAttributeObject &VKVaoCache::vao_get(GPUBatch *batch)
VKVertexAttributeObject &VKVaoCache::vao_get(GPUBatch * /*batch*/)
{
Shader *shader = VKContext::get()->shader;
VKShaderInterface *interface = static_cast<VKShaderInterface *>(shader->interface);