GPU Vulkan Display: option to have uniform buffers in device memory with host access

davidrohr · davidrohr · commit 3fae08fb7160 · 2022-03-28T11:48:39.000+02:00
diff --git a/GPU/GPUTracking/Definitions/GPUSettingsList.h b/GPU/GPUTracking/Definitions/GPUSettingsList.h
@@ -260,6 +260,7 @@ EndConfig()
 // Vulkan Display Settings
 BeginSubConfig(GPUSettingsDisplayVulkan, vulkan, configStandalone.display, "GLV", 0, "Vulkan display settings", display_vulkan)
 AddOption(nFramesInFlight, int, 0, "", 0, "Max number of render frames in flight (0 = as many as swapchain images)")
+AddOption(uniformBuffersInDeviceMemory, bool, 1, "", 0, "Have uniform buffers in host-accessible device memory")
 AddHelp("help", 'h')
 EndConfig()
 
diff --git a/GPU/GPUTracking/display/GPUDisplayBackendVulkan.cxx b/GPU/GPUTracking/display/GPUDisplayBackendVulkan.cxx
@@ -554,8 +554,8 @@ void GPUDisplayBackendVulkan::createUniformLayoutsAndBuffers()
     mUniformBuffersMat[j].resize(mFramesInFlight);
     mUniformBuffersCol[j].resize(mFramesInFlight);
     for (unsigned int i = 0; i < mFramesInFlight; i++) {
-      mUniformBuffersMat[j][i] = createBuffer(sizeof(hmm_mat4), nullptr, vk::BufferUsageFlagBits::eUniformBuffer, false);
-      mUniformBuffersCol[j][i] = createBuffer(sizeof(float) * 4, nullptr, vk::BufferUsageFlagBits::eUniformBuffer, false);
+      mUniformBuffersMat[j][i] = createBuffer(sizeof(hmm_mat4), nullptr, vk::BufferUsageFlagBits::eUniformBuffer, mDisplay->cfg().vulkan.uniformBuffersInDeviceMemory ? 2 : 0);
+      mUniformBuffersCol[j][i] = createBuffer(sizeof(float) * 4, nullptr, vk::BufferUsageFlagBits::eUniformBuffer, mDisplay->cfg().vulkan.uniformBuffersInDeviceMemory ? 2 : 0);
     }
   }
 
@@ -966,7 +966,7 @@ void GPUDisplayBackendVulkan::createOffscreenBuffers(bool forScreenshot, bool fo
       {0, (float)mRenderHeight, 0.0f, 1.0f},
       {(float)mRenderWidth, 0, 1.0f, 0.0f},
       {(float)mRenderWidth, (float)mRenderHeight, 1.0f, 1.0f}};
-    mMixingTextureVertexArray = createBuffer(sizeof(vertices), &vertices[0][0], vk::BufferUsageFlagBits::eVertexBuffer, true);
+    mMixingTextureVertexArray = createBuffer(sizeof(vertices), &vertices[0][0], vk::BufferUsageFlagBits::eVertexBuffer, 1);
 
     if (mCommandBufferPerImage) {
       for (unsigned int i = 0; i < mFramesInFlight; i++) {
@@ -1245,13 +1245,13 @@ void GPUDisplayBackendVulkan::clearShaders()
 
 void GPUDisplayBackendVulkan::writeToBuffer(VulkanBuffer& buffer, size_t size, const void* srcData)
 {
-  if (!buffer.deviceMemory) {
+  if (buffer.deviceMemory != 1) {
     void* dstData;
     CHKERR(mDevice.mapMemory(buffer.memory, 0, buffer.size, {}, &dstData));
     memcpy(dstData, srcData, size);
     mDevice.unmapMemory(buffer.memory);
   } else {
-    auto tmp = createBuffer(size, srcData, vk::BufferUsageFlagBits::eTransferSrc, false);
+    auto tmp = createBuffer(size, srcData, vk::BufferUsageFlagBits::eTransferSrc, 0);
 
     vk::CommandBuffer commandBuffer = getSingleTimeCommandBuffer();
     vk::BufferCopy copyRegion{};
@@ -1265,7 +1265,13 @@ void GPUDisplayBackendVulkan::writeToBuffer(VulkanBuffer& buffer, size_t size, c
 
 GPUDisplayBackendVulkan::VulkanBuffer GPUDisplayBackendVulkan::createBuffer(size_t size, const void* srcData, vk::BufferUsageFlags type, int deviceMemory)
 {
-  vk::MemoryPropertyFlags properties = deviceMemory ? vk::MemoryPropertyFlagBits::eDeviceLocal : (vk::MemoryPropertyFlagBits::eHostVisible | vk::MemoryPropertyFlagBits::eHostCoherent);
+  vk::MemoryPropertyFlags properties;
+  if (deviceMemory) {
+    properties |= vk::MemoryPropertyFlagBits::eDeviceLocal;
+  }
+  if (deviceMemory == 0 || deviceMemory == 2) {
+    properties |= (vk::MemoryPropertyFlagBits::eHostVisible | vk::MemoryPropertyFlagBits::eHostCoherent);
+  }
   if (deviceMemory == 1) {
     type |= vk::BufferUsageFlagBits::eTransferDst;
   }
@@ -1324,7 +1330,7 @@ void GPUDisplayBackendVulkan::clearVertexBuffers()
 
 void GPUDisplayBackendVulkan::writeToImage(VulkanImage& image, const void* srcData, size_t srcSize)
 {
-  auto tmp = createBuffer(srcSize, srcData, vk::BufferUsageFlagBits::eTransferSrc, false);
+  auto tmp = createBuffer(srcSize, srcData, vk::BufferUsageFlagBits::eTransferSrc, 0);
 
   vk::CommandBuffer commandBuffer = getSingleTimeCommandBuffer();
   cmdImageMemoryBarrier(commandBuffer, image.image, {}, vk::AccessFlagBits::eTransferWrite, vk::ImageLayout::eUndefined, vk::ImageLayout::eTransferDstOptimal, vk::PipelineStageFlagBits::eTopOfPipe, vk::PipelineStageFlagBits::eTransfer);
@@ -1430,10 +1436,10 @@ void GPUDisplayBackendVulkan::loadDataToGPU(size_t totalVertizes)
 {
   mDevice.waitIdle();
   clearVertexBuffers();
-  mVBO = createBuffer(totalVertizes * sizeof(mDisplay->vertexBuffer()[0][0]), mDisplay->vertexBuffer()[0].data());
+  mVBO = createBuffer(totalVertizes * sizeof(mDisplay->vertexBuffer()[0][0]), mDisplay->vertexBuffer()[0].data(), vk::BufferUsageFlagBits::eVertexBuffer, 1);
   if (mDisplay->cfgR().useGLIndirectDraw) {
     fillIndirectCmdBuffer();
-    mIndirectCommandBuffer = createBuffer(mCmdBuffer.size() * sizeof(mCmdBuffer[0]), mCmdBuffer.data(), vk::BufferUsageFlagBits::eIndirectBuffer);
+    mIndirectCommandBuffer = createBuffer(mCmdBuffer.size() * sizeof(mCmdBuffer[0]), mCmdBuffer.data(), vk::BufferUsageFlagBits::eIndirectBuffer, 1);
     mCmdBuffer.clear();
   }
   needRecordCommandBuffers();
@@ -1665,7 +1671,7 @@ void GPUDisplayBackendVulkan::finishText()
   if (mFontVertexBuffer[mCurrentBufferSet].size) {
     clearBuffer(mFontVertexBuffer[mCurrentBufferSet]);
   }
-  mFontVertexBuffer[mCurrentBufferSet] = createBuffer(mFontVertexBufferHost.size() * sizeof(float), mFontVertexBufferHost.data(), vk::BufferUsageFlagBits::eVertexBuffer, false);
+  mFontVertexBuffer[mCurrentBufferSet] = createBuffer(mFontVertexBufferHost.size() * sizeof(float), mFontVertexBufferHost.data(), vk::BufferUsageFlagBits::eVertexBuffer, 0);
 
   mCommandBuffersText[mCurrentBufferSet].bindPipeline(vk::PipelineBindPoint::eGraphics, mPipelines[3]);
   mCommandBuffersText[mCurrentBufferSet].bindDescriptorSets(vk::PipelineBindPoint::eGraphics, mPipelineLayoutTexture, 0, 1, &mDescriptorSets[1][mCurrentBufferSet], 0, nullptr);
diff --git a/GPU/GPUTracking/display/GPUDisplayBackendVulkan.h b/GPU/GPUTracking/display/GPUDisplayBackendVulkan.h
@@ -45,7 +45,7 @@ class GPUDisplayBackendVulkan : public GPUDisplayBackend
     vk::Buffer buffer;
     vk::DeviceMemory memory;
     size_t size = 0;
-    bool deviceMemory;
+    int deviceMemory;
   };
   struct VulkanImage {
     vk::Image image;
