diff --git a/build-win64.txt b/build-win64.txt index 63d67d83..cb2eb0ea 100644 --- a/build-win64.txt +++ b/build-win64.txt @@ -9,7 +9,7 @@ exe_wrapper = 'wine' c_args = ['-Og', '-ggdb'] c_link_args = ['-static', '-static-libgcc'] -cpp_args = ['-Og', '-gstabs'] +cpp_args = ['-Og', '-gdwarf'] cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++'] [host_machine] diff --git a/src/dxvk/dxvk_lifetime.cpp b/src/dxvk/dxvk_lifetime.cpp index c99c26de..cc7652ee 100644 --- a/src/dxvk/dxvk_lifetime.cpp +++ b/src/dxvk/dxvk_lifetime.cpp @@ -6,12 +6,6 @@ namespace dxvk { DxvkLifetimeTracker::~DxvkLifetimeTracker() { } - void DxvkLifetimeTracker::trackResource(const Rc& rc) { - if (m_resources.insert(rc).second) - rc->acquire(); - } - - void DxvkLifetimeTracker::reset() { for (auto i = m_resources.cbegin(); i != m_resources.cend(); i++) (*i)->release(); diff --git a/src/dxvk/dxvk_lifetime.h b/src/dxvk/dxvk_lifetime.h index ebdf2ef8..4534fe4f 100644 --- a/src/dxvk/dxvk_lifetime.h +++ b/src/dxvk/dxvk_lifetime.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "dxvk_resource.h" @@ -25,8 +25,10 @@ namespace dxvk { * \brief Adds a resource to track * \param [in] rc The resource to track */ - void trackResource( - const Rc& rc); + void trackResource(const Rc& rc) { + m_resources.push_back(rc); + rc->acquire(); + } /** * \brief Resets the command list @@ -38,7 +40,7 @@ namespace dxvk { private: - std::unordered_set, RcHash> m_resources; + std::vector> m_resources; };