godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Merge pull request #98910 from darksylinc/matias-id_arm32

Browse Source 
Force `RDD::id` to be always `uint64_t`
This commit is contained in:
Thaddeus Crews
2024-11-10 12:12:53 -06:00
parent b0a8540775 e69a0c7d60
commit 3cff32a92d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
servers/rendering/rendering_device_driver.h
View File

@@ -120,9 +120,9 @@ struct VersatileResourceTemplate {
class RenderingDeviceDriver : public RenderingDeviceCommons { class RenderingDeviceDriver : public RenderingDeviceCommons {
public: public:
struct ID { struct ID {
size_t id = 0; uint64_t id = 0;
_ALWAYS_INLINE_ ID() = default; _ALWAYS_INLINE_ ID() = default;
_ALWAYS_INLINE_ ID(size_t p_id) : _ALWAYS_INLINE_ ID(uint64_t p_id) :
id(p_id) {} id(p_id) {}
}; };
@@ -138,11 +138,9 @@ public:
_ALWAYS_INLINE_ bool operator!=(const m_name##ID &p_other) const { return id != p_other.id; } \ _ALWAYS_INLINE_ bool operator!=(const m_name##ID &p_other) const { return id != p_other.id; } \
_ALWAYS_INLINE_ m_name##ID(const m_name##ID &p_other) : ID(p_other.id) {} \ _ALWAYS_INLINE_ m_name##ID(const m_name##ID &p_other) : ID(p_other.id) {} \
_ALWAYS_INLINE_ explicit m_name##ID(uint64_t p_int) : ID(p_int) {} \ _ALWAYS_INLINE_ explicit m_name##ID(uint64_t p_int) : ID(p_int) {} \
_ALWAYS_INLINE_ explicit m_name##ID(void *p_ptr) : ID((size_t)p_ptr) {} \ _ALWAYS_INLINE_ explicit m_name##ID(void *p_ptr) : ID((uint64_t)p_ptr) {} \
_ALWAYS_INLINE_ m_name##ID() = default; \ _ALWAYS_INLINE_ m_name##ID() = default; \
}; \ };
/* Ensure type-punnable to pointer. Makes some things easier.*/ \
static_assert(sizeof(m_name##ID) == sizeof(void *));
// Id types declared before anything else to prevent cyclic dependencies between the different concerns. // Id types declared before anything else to prevent cyclic dependencies between the different concerns.
DEFINE_ID(Buffer); DEFINE_ID(Buffer);