VK: Begin implementing binding the descriptor buffer

Author: Ravbug

include/RGL/Texture.hpp

@@ -126,6 +126,8 @@ namespace RGL {
 		}
 #endif
 		TextureView() {}
+
+		uint32_t GetReadonlyBindlessTextureHandle();
 	};
 
 

src/Texture.cpp

@@ -0,0 +1,19 @@
+#include "Texture.hpp"
+#include "RGL.hpp"
+#include "VkTexture.hpp"
+#include <stdexcept>
+
+namespace RGL {
+	uint32_t TextureView::GetReadonlyBindlessTextureHandle() {
+		auto backend = RGL::CurrentAPI();
+		switch (backend) {
+		case API::Direct3D12:
+			return texture.dx.srvIDX;
+		case API::Vulkan:
+			return static_cast<const TextureVk*>(parent)->globalDescriptorIndex;
+		default:
+			throw std::runtime_error("Current backend does not support bindless texturing.");
+		}
+		return 0;
+	}
+}

src/VkCommandBuffer.cpp

@@ -216,6 +216,16 @@ namespace RGL {
 
 		auto vktexture = static_cast<const TextureVk*>(texture.parent);
 
+		if (vktexture == nullptr) {
+
+			EncodeCommand(CmdBindlessSetTexture{
+				.bda = texture.texture.vk.bindlessInfo.bda,
+				.binding = index
+			});
+
+			return;
+		}
+
 		auto nextLayout = vktexture->createdConfig.usage.DepthStencilAttachment ? VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
 
 		auto activeLayout = currentRenderPipeline ? currentRenderPipeline->pipelineLayout : currentComputePipeline->pipelineLayout;
@@ -687,6 +697,29 @@ namespace RGL {
 					swapchainImages.insert(key.texture);
 				}
 			},
+			[this](const CmdBindlessSetTexture& arg) {
+				// tell the command buffer about the descriptor buffer
+				VkDescriptorBufferBindingInfoEXT descriptor_buffer_binding_info{
+					.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_INFO_EXT,
+					.address = arg.bda,
+					.usage = VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT
+				};
+				owningQueue->owningDevice->rgl_vkCmdBindDescriptorBuffersEXT(commandBuffer,1, &descriptor_buffer_binding_info);
+
+				uint32_t bufferIndices[] = { arg.binding };
+				VkDeviceSize offset = 0;
+
+				// assign it a binding slot
+				const bool isCompute = currentRenderPipeline ? false : true;
+				const auto activeLayout = isCompute ? currentComputePipeline->pipelineLayout : currentRenderPipeline->pipelineLayout;
+				owningQueue->owningDevice->rgl_vkCmdSetDescriptorBufferOffsetsEXT(commandBuffer,
+					isCompute ? VK_PIPELINE_BIND_POINT_COMPUTE : VK_PIPELINE_BIND_POINT_GRAPHICS,
+					activeLayout->layout,
+					0,
+					1,
+					bufferIndices,
+					&offset);
+			},
 			[this](const CmdDraw& arg) {
 				vkCmdDraw(commandBuffer, arg.nVertices, arg.config.nInstances, arg.config.startVertex, arg.config.firstInstance);
 			},

src/VkCommandBuffer.hpp

@@ -172,6 +172,11 @@ namespace RGL {
 			uint32_t size;
 		};
 
+		struct CmdBindlessSetTexture {
+			const VkDeviceAddress bda;
+			const uint32_t binding;
+		};
+
 		struct CmdCopyTextureToTexture {
 			TextureCopyConfig from, to;
 			uint32_t fromMip, fromLayer, toMip, toLayer;
@@ -201,7 +206,8 @@ namespace RGL {
 			CmdSetViewport,
 			CmdSetScissor,
 			CmdCopyBufferToBuffer,
-			CmdCopyBuffertoTexture
+			CmdCopyBuffertoTexture,
+			CmdBindlessSetTexture
 		>
 		> renderCommands;
 

src/VkDevice.cpp

@@ -257,6 +257,8 @@ namespace RGL {
         loadVulkanFunction(device, rgl_vkGetDescriptorSetLayoutSizeEXT, "vkGetDescriptorSetLayoutSizeEXT");
         loadVulkanFunction(device, rgl_vkGetDescriptorSetLayoutBindingOffsetEXT, "vkGetDescriptorSetLayoutBindingOffsetEXT");
         loadVulkanFunction(device, rgl_vkGetDescriptorEXT, "vkGetDescriptorEXT");
+        loadVulkanFunction(device, rgl_vkCmdBindDescriptorBuffersEXT, "vkCmdBindDescriptorBuffersEXT");
+        loadVulkanFunction(device, rgl_vkCmdSetDescriptorBufferOffsetsEXT, "vkCmdSetDescriptorBufferOffsetsEXT");
 
 #ifndef NDEBUG
         loadVulkanFunction(device, rgl_vkDebugMarkerSetObjectNameEXT, "vkDebugMarkerSetObjectNameEXT");
@@ -305,11 +307,11 @@ namespace RGL {
             .pBindings = &set_layout_binding
         };
 
-        ;
+        ; 
 
         VK_CHECK(vkCreateDescriptorSetLayout(device, &descriptor_layout_create_info, nullptr, &globalDescriptorSetLayout));
         rgl_vkGetDescriptorSetLayoutSizeEXT(device, globalDescriptorSetLayout, &globalDescriptorSetSize);
-        globalDescriptorBufferAllocation = createBuffer(this, globalDescriptorSetSize,VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, VMA_MEMORY_USAGE_CPU_TO_GPU, globalDescriptorBuffer);
+        globalDescriptorBufferAllocation = createBuffer(this, globalDescriptorSetSize, VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, VMA_MEMORY_USAGE_CPU_TO_GPU, globalDescriptorBuffer);
 
         vmaMapMemory(vkallocator, globalDescriptorBufferAllocation, &globalDescriptorMappedMemory);
 
@@ -330,6 +332,8 @@ namespace RGL {
             .buffer = globalDescriptorBuffer
         };
         globalDescriptorBDA = vkGetBufferDeviceAddress(device, &bdaInfo);
+
+        SetDebugNameForResource(globalDescriptorBuffer, VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "Bindless Image Descriptor Buffer");
     }
 
     void DeviceVk::SetDebugNameForResource(void* resource, VkDebugReportObjectTypeEXT type, const char* debugName)

src/VkDevice.hpp

@@ -34,6 +34,8 @@ namespace RGL {
 		PFN_vkGetDescriptorSetLayoutSizeEXT rgl_vkGetDescriptorSetLayoutSizeEXT = nullptr;
 		PFN_vkGetDescriptorSetLayoutBindingOffsetEXT rgl_vkGetDescriptorSetLayoutBindingOffsetEXT = nullptr;
 		PFN_vkGetDescriptorEXT rgl_vkGetDescriptorEXT = nullptr;
+		PFN_vkCmdBindDescriptorBuffersEXT rgl_vkCmdBindDescriptorBuffersEXT = nullptr;
+		PFN_vkCmdSetDescriptorBufferOffsetsEXT rgl_vkCmdSetDescriptorBufferOffsetsEXT = nullptr;
 
 		virtual ~DeviceVk();
 		DeviceVk(decltype(physicalDevice) physicalDevice);