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

[dxvk] Pass DxvkDevice to DxvkEventPool constructor

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

View File

@ -20,7 +20,7 @@ namespace dxvk {
m_memory (new DxvkMemoryAllocator (this)), m_memory (new DxvkMemoryAllocator (this)),
m_renderPassPool (new DxvkRenderPassPool (vkd)), m_renderPassPool (new DxvkRenderPassPool (vkd)),
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 (this)),
m_gpuQueryPool (new DxvkGpuQueryPool (this)), m_gpuQueryPool (new DxvkGpuQueryPool (this)),
m_metaClearObjects (new DxvkMetaClearObjects (this)), m_metaClearObjects (new DxvkMetaClearObjects (this)),
m_metaCopyObjects (new DxvkMetaCopyObjects (this)), m_metaCopyObjects (new DxvkMetaCopyObjects (this)),

View File

@ -1,4 +1,5 @@
#include "dxvk_gpu_event.h" #include "dxvk_gpu_event.h"
#include "dxvk_device.h"
namespace dxvk { namespace dxvk {
@ -35,8 +36,8 @@ namespace dxvk {
DxvkGpuEventPool::DxvkGpuEventPool(const Rc<vk::DeviceFn>& vkd) DxvkGpuEventPool::DxvkGpuEventPool(const DxvkDevice* device)
: m_vkd(vkd) { } : m_vkd(device->vkd()) { }
DxvkGpuEventPool::~DxvkGpuEventPool() { DxvkGpuEventPool::~DxvkGpuEventPool() {

View File

@ -6,6 +6,7 @@
namespace dxvk { namespace dxvk {
class DxvkDevice;
class DxvkGpuEventPool; class DxvkGpuEventPool;
/** /**
@ -87,7 +88,7 @@ namespace dxvk {
public: public:
DxvkGpuEventPool(const Rc<vk::DeviceFn>& vkd); DxvkGpuEventPool(const DxvkDevice* device);
~DxvkGpuEventPool(); ~DxvkGpuEventPool();
/** /**