From f6bb292901e3351c074e732f1ea0029551852409 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 12 May 2023 12:03:45 +0200 Subject: [PATCH] Vulkan: Fix Compilation Issues on Windows VKVertexAttributeObject was both defined as a class and a struct. Settled on being a class. --- source/blender/gpu/vulkan/vk_vertex_attribute_object.cc | 2 -- source/blender/gpu/vulkan/vk_vertex_attribute_object.hh | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/blender/gpu/vulkan/vk_vertex_attribute_object.cc b/source/blender/gpu/vulkan/vk_vertex_attribute_object.cc index f3e3444f277..d50e4c84a6b 100644 --- a/source/blender/gpu/vulkan/vk_vertex_attribute_object.cc +++ b/source/blender/gpu/vulkan/vk_vertex_attribute_object.cc @@ -96,8 +96,6 @@ void VKVertexAttributeObject::update_bindings(const VKContext &context, VKBatch } is_valid = true; - - BLI_assert(interface.enabled_attr_mask_ == occupied_attributes); } void VKVertexAttributeObject::update_bindings(VKImmediate &immediate) diff --git a/source/blender/gpu/vulkan/vk_vertex_attribute_object.hh b/source/blender/gpu/vulkan/vk_vertex_attribute_object.hh index fa14bdd31bb..febee378245 100644 --- a/source/blender/gpu/vulkan/vk_vertex_attribute_object.hh +++ b/source/blender/gpu/vulkan/vk_vertex_attribute_object.hh @@ -22,7 +22,8 @@ class VKImmediate; using AttributeMask = uint16_t; -struct VKVertexAttributeObject { +class VKVertexAttributeObject { +public: bool is_valid = false; VkPipelineVertexInputStateCreateInfo info = { VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO, NULL}; -- 2.30.2