diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-11-11 09:07:04 -0500 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-11 09:08:01 -0500 |
| commit | 62fbec9f6f0722a1f9825c17f073742932082228 (patch) | |
| tree | a10abf56ba93705731da1aaf338f2cf21403c6ad /servers/rendering/rendering_device_driver.h | |
| parent | e7894c2c4efdd51049a21af4892005381fe57cd6 (diff) | |
| parent | 0f5f3bc9546b46b2029fc8896dc859697f1eab97 (diff) | |
| download | redot-engine-62fbec9f6f0722a1f9825c17f073742932082228.tar.gz | |
Merge commit godotengine/godot@0f5f3bc9546b46b2029fc8896dc859697f1eab97
Diffstat (limited to 'servers/rendering/rendering_device_driver.h')
| -rw-r--r-- | servers/rendering/rendering_device_driver.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/servers/rendering/rendering_device_driver.h b/servers/rendering/rendering_device_driver.h index 3046c8d1a3..689e4fd41f 100644 --- a/servers/rendering/rendering_device_driver.h +++ b/servers/rendering/rendering_device_driver.h @@ -122,9 +122,9 @@ struct VersatileResourceTemplate { class RenderingDeviceDriver : public RenderingDeviceCommons { public: struct ID { - size_t id = 0; + uint64_t id = 0; _ALWAYS_INLINE_ ID() = default; - _ALWAYS_INLINE_ ID(size_t p_id) : + _ALWAYS_INLINE_ ID(uint64_t p_id) : id(p_id) {} }; @@ -140,11 +140,9 @@ public: _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_ 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; \ - }; \ - /* 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. DEFINE_ID(Buffer); |