source/blender/gpu/vulkan/vk_batch.cc

@@ -20,7 +20,6 @@ void VKBatch::draw(int v_first, int v_count, int i_first, int i_count)
     flag &= ~GPU_BATCH_DIRTY;
   }
 
-  // Based on the context construct the pipeline.
   VKContext &context = *VKContext::get();
   context.state_manager->apply_state();
   VKVertexAttributeObject &vao = vao_cache_.vao_get(this);

source/blender/gpu/vulkan/vk_pipeline.cc

@@ -108,15 +108,7 @@ void VKPipeline::finalize(VKContext &context,
   vertex_stage_info.module = vertex_module;
   vertex_stage_info.pName = "main";
   pipeline_stages.append(vertex_stage_info);
-  /*
-    if (geometry_module_ != VK_NULL_HANDLE) {
-      VkPipelineShaderStageCreateInfo geo_stage_info = {};
-      geo_stage_info.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
-      geo_stage_info.stage = VK_SHADER_STAGE_GEOMETRY_BIT;
-      geo_stage_info.module = geometry_module_;
-      geo_stage_info.pName = "main";
-      pipeline_stages.append(geo_stage_info);
-    }*/
+
   if (fragment_module != VK_NULL_HANDLE) {
     VkPipelineShaderStageCreateInfo fragment_stage_info = {};
     fragment_stage_info.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
@@ -170,7 +162,7 @@ void VKPipeline::finalize(VKContext &context,
   multisample_state.minSampleShading = 1.0f;
   pipeline_create_info.pMultisampleState = &multisample_state;
 
-  /* Color blend state. */
+  /* States from the state manager. */
   const VKPipelineStateManager &state_manager = state_manager_get();
   pipeline_create_info.pColorBlendState = &state_manager.pipeline_color_blend_state;
   pipeline_create_info.pRasterizationState = &state_manager.rasterization_state;

source/blender/gpu/vulkan/vk_vertex_attribute_object.cc

@@ -32,26 +32,14 @@ VKVertexAttributeObject &VKVertexAttributeObject::operator=(const VKVertexAttrib
     return *this;
   }
 
-  /* TODO: resize is an exact resize. Might introduce unneeded re-allocations. */
-  /* TODO: This might copy data, that isn't needed. */
-
   is_valid = other.is_valid;
   info = other.info;
-  bindings.resize(other.bindings.size());
-  int i = 0;
-  for (const VkVertexInputBindingDescription &e : other.bindings) {
-    bindings[i++] = e;
-  }
-  i = 0;
-  attributes.resize(other.attributes.size());
-  for (const VkVertexInputAttributeDescription e : other.attributes) {
-    attributes[i++] = e;
-  }
-  i = 0;
-  vbos.resize(other.vbos.size());
-  for (VKVertexBuffer *e : other.vbos) {
-    vbos[i++] = e;
-  }
+  bindings.clear();
+  bindings.extend(other.bindings);
+  attributes.clear();
+  attributes.extend(other.attributes);
+  vbos.clear();
+  vbos.extend(other.vbos);
   return *this;
 }
 
@@ -74,6 +62,7 @@ void VKVertexAttributeObject::bind(VKContext &context)
 
 void VKVertexAttributeObject::update_bindings(const VKContext &context, VKBatch &batch)
 {
+  clear();
   const VKShaderInterface &interface = unwrap(context.shader)->interface_get();
   AttributeMask occupied_attributes = 0;
 
@@ -91,6 +80,8 @@ void VKVertexAttributeObject::update_bindings(const VKContext &context, VKBatch
     }
   }
 
+  is_valid = true;
+
   BLI_assert(interface.enabled_attr_mask_ == occupied_attributes);
 }
 
@@ -107,7 +98,6 @@ void VKVertexAttributeObject::update_bindings(VKVertexBuffer &vertex_buffer,
 
   uint32_t offset = 0;
   uint32_t stride = format.stride;
-  const uint32_t binding = bindings.size();
 
   for (uint32_t attribute_index = 0; attribute_index < format.attr_len; attribute_index++) {
     const GPUVertAttr &attribute = format.attrs[attribute_index];
@@ -120,14 +110,9 @@ void VKVertexAttributeObject::update_bindings(VKVertexBuffer &vertex_buffer,
       offset = attribute.offset;
     }
 
-    VkVertexInputBindingDescription vk_binding_descriptor = {};
-    vk_binding_descriptor.binding = binding;
-    vk_binding_descriptor.stride = stride;
-    vk_binding_descriptor.inputRate = use_instancing ? VK_VERTEX_INPUT_RATE_INSTANCE :
-                                                       VK_VERTEX_INPUT_RATE_VERTEX;
-    bindings.append(vk_binding_descriptor);
-    vbos.append(&vertex_buffer);
+    const uint32_t binding = bindings.size();
 
+    bool attribute_used_by_shader = false;
     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);
@@ -141,14 +126,26 @@ void VKVertexAttributeObject::update_bindings(VKVertexBuffer &vertex_buffer,
         continue;
       }
       r_occupied_attributes |= attribute_mask;
+      attribute_used_by_shader = true;
 
       VkVertexInputAttributeDescription attribute_description = {};
       attribute_description.binding = binding;
       attribute_description.location = shader_input->location;
+      attribute_description.offset = offset;
       attribute_description.format = to_vk_format(
           static_cast<GPUVertCompType>(attribute.comp_type), attribute.size);
       attributes.append(attribute_description);
     }
+
+    if (attribute_used_by_shader) {
+      VkVertexInputBindingDescription vk_binding_descriptor = {};
+      vk_binding_descriptor.binding = binding;
+      vk_binding_descriptor.stride = stride;
+      vk_binding_descriptor.inputRate = use_instancing ? VK_VERTEX_INPUT_RATE_INSTANCE :
+                                                         VK_VERTEX_INPUT_RATE_VERTEX;
+      bindings.append(vk_binding_descriptor);
+      vbos.append(&vertex_buffer);
+    }
   }
 }