From fce424ccfeed90b92498916df8642ee56894ff0b Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 11 Oct 2017 09:51:22 +0200 Subject: [PATCH] Minor --- src/dxgi/dxgi_object.h | 6 ++++-- src/dxvk/dxvk_device.cpp | 4 ++-- src/dxvk/dxvk_image.h | 12 ------------ 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/dxgi/dxgi_object.h b/src/dxgi/dxgi_object.h index 004b6dbb..e14a32e6 100644 --- a/src/dxgi/dxgi_object.h +++ b/src/dxgi/dxgi_object.h @@ -1,6 +1,8 @@ #pragma once -#include "dxgi_private_data.h" +#include "dxgi_include.h" + +#include "../util/com/com_private_data.h" namespace dxvk { @@ -34,7 +36,7 @@ namespace dxvk { private: - DxgiPrivateData m_privateData; + ComPrivateData m_privateData; }; diff --git a/src/dxvk/dxvk_device.cpp b/src/dxvk/dxvk_device.cpp index 9b492b64..9bde75aa 100644 --- a/src/dxvk/dxvk_device.cpp +++ b/src/dxvk/dxvk_device.cpp @@ -50,7 +50,7 @@ namespace dxvk { Rc DxvkDevice::createImage( const DxvkImageCreateInfo& createInfo, VkMemoryPropertyFlags memoryType) { - + // TODO implement } @@ -112,7 +112,7 @@ namespace dxvk { if (m_vkd->vkQueueSubmit(m_graphicsQueue, 1, &info, fence->handle()) != VK_SUCCESS) throw DxvkError("DxvkDevice::submitCommandList: Command submission failed"); - // TODO Store fence + command list pairs in a ring buffer + // TODO Delay synchronization by putting these into a ring buffer fence->wait(std::numeric_limits::max()); commandList->reset(); return fence; diff --git a/src/dxvk/dxvk_image.h b/src/dxvk/dxvk_image.h index 5e367731..8fef38b5 100644 --- a/src/dxvk/dxvk_image.h +++ b/src/dxvk/dxvk_image.h @@ -34,18 +34,6 @@ namespace dxvk { public: - /** - * \brief Creates a new image - * - * \param [in] vkd Vulkan device functions - * \param [in] info Image properties - * \param [in] memory Image memory - */ -// DxvkImage( -// const Rc& vkd, -// const DxvkImageCreateInfo& info, -// DxvkMemory&& memory); - /** * \brief Creates image object from existing image *