backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxvk] Fix circular reference between DxvkDevice and DxvkGpuQueryPool

Browse Source
This commit is contained in:
Philip Rebohle 2019-04-06 12:31:20 +02:00
parent 3eb9f35fc3
commit f6bdb7bb63
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dxvk/dxvk_gpu_query.cpp
View File

@ -155,7 +155,7 @@ namespace dxvk {
DxvkGpuQueryAllocator::DxvkGpuQueryAllocator( DxvkGpuQueryAllocator::DxvkGpuQueryAllocator(
const Rc<DxvkDevice>& device, DxvkDevice* device,
VkQueryType queryType, VkQueryType queryType,
uint32_t queryPoolSize) uint32_t queryPoolSize)
: m_device (device), : m_device (device),
@ -254,7 +254,7 @@ namespace dxvk {
DxvkGpuQueryPool::DxvkGpuQueryPool(const Rc<DxvkDevice>& device) DxvkGpuQueryPool::DxvkGpuQueryPool(DxvkDevice* device)
: m_occlusion(device, VK_QUERY_TYPE_OCCLUSION, 256), : m_occlusion(device, VK_QUERY_TYPE_OCCLUSION, 256),
m_statistic(device, VK_QUERY_TYPE_PIPELINE_STATISTICS, 64), m_statistic(device, VK_QUERY_TYPE_PIPELINE_STATISTICS, 64),
m_timestamp(device, VK_QUERY_TYPE_TIMESTAMP, 64), m_timestamp(device, VK_QUERY_TYPE_TIMESTAMP, 64),

7
src/dxvk/dxvk_gpu_query.h
View File

@ -247,7 +247,7 @@ namespace dxvk {
public: public:
DxvkGpuQueryAllocator( DxvkGpuQueryAllocator(
const Rc<DxvkDevice>& device, DxvkDevice* device,
VkQueryType queryType, VkQueryType queryType,
uint32_t queryPoolSize); uint32_t queryPoolSize);
@ -275,7 +275,7 @@ namespace dxvk {
private: private:
Rc<DxvkDevice> m_device; DxvkDevice* m_device;
Rc<vk::DeviceFn> m_vkd; Rc<vk::DeviceFn> m_vkd;
VkQueryType m_queryType; VkQueryType m_queryType;
uint32_t m_queryPoolSize; uint32_t m_queryPoolSize;
@ -299,8 +299,7 @@ namespace dxvk {
public: public:
DxvkGpuQueryPool( DxvkGpuQueryPool(DxvkDevice* device);
const Rc<DxvkDevice>& device);
~DxvkGpuQueryPool(); ~DxvkGpuQueryPool();