rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-21 21:57:39 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Move image view cookie to DxvkResource

Browse Source
This commit is contained in:
Philip Rebohle 2022-08-07 21:24:57 +02:00
parent 4831909656
commit 2b2c44aa99
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
4 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dxvk/dxvk_image.cpp
View File

@ -4,9 +4,6 @@
namespace dxvk {
std::atomic<uint64_t> DxvkImageView::s_cookie = { 0ull };
DxvkImage::DxvkImage(
const DxvkDevice* device,
const DxvkImageCreateInfo& createInfo,
@ -220,7 +217,7 @@ namespace dxvk {
const Rc<vk::DeviceFn>& vkd,
const Rc<DxvkImage>& image,
const DxvkImageViewCreateInfo& info)
: m_vkd(vkd), m_image(image), m_info(info), m_cookie(++s_cookie) {
: m_vkd(vkd), m_image(image), m_info(info) {
for (uint32_t i = 0; i < ViewCount; i++)
m_views[i] = VK_NULL_HANDLE;

16
src/dxvk/dxvk_image.h
View File

@ -438,18 +438,6 @@ namespace dxvk {
return lookupFormatInfo(m_info.format);
}
/**
* \brief Unique object identifier
*
* Can be used to identify an object even when
* the lifetime of the object is unknown, and
* without referencing the actual object.
* \returns Unique identifier
*/
uint64_t cookie() const {
return m_cookie;
}
/**
* \brief Mip level size
*
@ -567,10 +555,6 @@ namespace dxvk {
DxvkImageViewCreateInfo m_info;
VkImageView m_views[ViewCount];
uint64_t m_cookie;
static std::atomic<uint64_t> s_cookie;
void createView(VkImageViewType type, uint32_t numLayers);
};

9
src/dxvk/dxvk_resource.cpp
View File

@ -2,6 +2,15 @@
namespace dxvk {
std::atomic<uint64_t> DxvkResource::s_cookie = { 0ull };
DxvkResource::DxvkResource()
: m_useCount(0ull), m_cookie(++s_cookie) {
}
DxvkResource::~DxvkResource() {
}

21
src/dxvk/dxvk_resource.h
View File

@ -31,9 +31,23 @@ namespace dxvk {
static constexpr uint64_t RdAccessInc = 1ull << RdAccessShift;
static constexpr uint64_t WrAccessInc = 1ull << WrAccessShift;
public:
DxvkResource();
virtual ~DxvkResource();
/**
* \brief Unique object identifier
*
* Can be used to identify an object even when
* the lifetime of the object is unknown, and
* without referencing the actual object.
* \returns Unique identifier
*/
uint64_t cookie() const {
return m_cookie;
}
/**
* \brief Increments reference count
* \returns New reference count
@ -104,7 +118,8 @@ namespace dxvk {
private:
std::atomic<uint64_t> m_useCount = { 0ull };
std::atomic<uint64_t> m_useCount;
uint64_t m_cookie;
static constexpr uint64_t getIncrement(DxvkAccess access) {
uint64_t increment = RefcountInc;
@ -117,6 +132,8 @@ namespace dxvk {
return increment;
}
static std::atomic<uint64_t> s_cookie;
};
}