1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-02 01:24:11 +01:00

[dxvk] Pass DxvkDevice to DxvkMetaClearObjects constructor

This commit is contained in:
Philip Rebohle 2019-07-30 19:05:40 +02:00
parent 6a58c432ec
commit 40028a5b8c
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 7 additions and 4 deletions

View File

@ -22,7 +22,7 @@ namespace dxvk {
m_pipelineManager (new DxvkPipelineManager (this, m_renderPassPool.ptr())), m_pipelineManager (new DxvkPipelineManager (this, m_renderPassPool.ptr())),
m_gpuEventPool (new DxvkGpuEventPool (vkd)), m_gpuEventPool (new DxvkGpuEventPool (vkd)),
m_gpuQueryPool (new DxvkGpuQueryPool (this)), m_gpuQueryPool (new DxvkGpuQueryPool (this)),
m_metaClearObjects (new DxvkMetaClearObjects (vkd)), m_metaClearObjects (new DxvkMetaClearObjects (this)),
m_metaCopyObjects (new DxvkMetaCopyObjects (this)), m_metaCopyObjects (new DxvkMetaCopyObjects (this)),
m_metaResolveObjects(new DxvkMetaResolveObjects (this)), m_metaResolveObjects(new DxvkMetaResolveObjects (this)),
m_metaMipGenObjects (new DxvkMetaMipGenObjects (this)), m_metaMipGenObjects (new DxvkMetaMipGenObjects (this)),

View File

@ -1,4 +1,5 @@
#include "dxvk_meta_clear.h" #include "dxvk_meta_clear.h"
#include "dxvk_device.h"
#include <dxvk_clear_buffer_f.h> #include <dxvk_clear_buffer_f.h>
#include <dxvk_clear_buffer_u.h> #include <dxvk_clear_buffer_u.h>
@ -15,8 +16,8 @@
namespace dxvk { namespace dxvk {
DxvkMetaClearObjects::DxvkMetaClearObjects(const Rc<vk::DeviceFn>& vkd) DxvkMetaClearObjects::DxvkMetaClearObjects(const DxvkDevice* device)
: m_vkd(vkd) { : m_vkd(device->vkd()) {
// Create descriptor set layouts // Create descriptor set layouts
m_clearBufDsetLayout = createDescriptorSetLayout(VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER); m_clearBufDsetLayout = createDescriptorSetLayout(VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER);
m_clearImgDsetLayout = createDescriptorSetLayout(VK_DESCRIPTOR_TYPE_STORAGE_IMAGE); m_clearImgDsetLayout = createDescriptorSetLayout(VK_DESCRIPTOR_TYPE_STORAGE_IMAGE);

View File

@ -6,6 +6,8 @@
#include "../spirv/spirv_code_buffer.h" #include "../spirv/spirv_code_buffer.h"
namespace dxvk { namespace dxvk {
class DxvkDevice;
/** /**
* \brief Clear args * \brief Clear args
@ -46,7 +48,7 @@ namespace dxvk {
public: public:
DxvkMetaClearObjects(const Rc<vk::DeviceFn>& vkd); DxvkMetaClearObjects(const DxvkDevice* device);
~DxvkMetaClearObjects(); ~DxvkMetaClearObjects();
/** /**