rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-05 01:24:14 +01:00
Code Issues Projects Releases Wiki Activity

[util] Rename always_inline to force_inline

Browse Source 
This conflicts with other libraries using the always_inline attribute in GCC as it defines it with the same name.
This commit is contained in:
Joshua Ashton 2022-08-20 23:43:18 +00:00 committed by Philip Rebohle
parent 0dc3200951
commit 5c2a748d96
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/rc/util_rc.h
View File

@ -17,7 +17,7 @@ namespace dxvk {
* \brief Increments reference count
* \returns New reference count
*/
always_inline uint32_t incRef() {
force_inline uint32_t incRef() {
return ++m_refCount;
}
@ -25,7 +25,7 @@ namespace dxvk {
* \brief Decrements reference count
* \returns New reference count
*/
always_inline uint32_t decRef() {
force_inline uint32_t decRef() {
return --m_refCount;
}

4
src/util/rc/util_rc_ptr.h
View File

@ -102,12 +102,12 @@ namespace dxvk {
T* m_object = nullptr;
always_inline void incRef() const {
force_inline void incRef() const {
if (m_object != nullptr)
m_object->incRef();
}
always_inline void decRef() const {
force_inline void decRef() const {
if (m_object != nullptr) {
if (m_object->decRef() == 0)
delete m_object;

4
src/util/util_likely.h
View File

@ -3,9 +3,9 @@
#ifdef __GNUC__
#define likely(x) __builtin_expect((x),1)
#define unlikely(x) __builtin_expect((x),0)
#define always_inline inline __attribute__((always_inline))
#define force_inline inline __attribute__((always_inline))
#else
#define likely(x) (x)
#define unlikely(x) (x)
#define always_inline inline
#define force_inline inline
#endif