diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/core/slang-chunked-list.h | 6 | ||||
| -rw-r--r-- | source/core/slang-com-object.h | 70 |
2 files changed, 74 insertions, 2 deletions
diff --git a/source/core/slang-chunked-list.h b/source/core/slang-chunked-list.h index ca79fe75a..fced9834a 100644 --- a/source/core/slang-chunked-list.h +++ b/source/core/slang-chunked-list.h @@ -165,7 +165,7 @@ public: T* add(T&& obj) { - auto chunk = _maybeReserveForAdd(); + auto chunk = _maybeReserveForAdd(1); auto result = chunk->begin() + chunk->size; chunk->begin()[chunk->size] = static_cast<T&&>(obj); chunk->size++; @@ -175,7 +175,7 @@ public: T* add(const T& obj) { - auto chunk = _maybeReserveForAdd(); + auto chunk = _maybeReserveForAdd(1); auto result = chunk->begin() + chunk->size; chunk->begin()[chunk->size] = obj; chunk->size++; @@ -226,6 +226,8 @@ public: { _deallocateBuffer(); m_count = 0; + for (auto& item : m_firstChunk.elements) + item = T(); } private: diff --git a/source/core/slang-com-object.h b/source/core/slang-com-object.h new file mode 100644 index 000000000..ad4578585 --- /dev/null +++ b/source/core/slang-com-object.h @@ -0,0 +1,70 @@ +#ifndef SLANG_COM_OBJECT_H +#define SLANG_COM_OBJECT_H + +#include "slang-basic.h" +#include <atomic> + +namespace Slang +{ +class ComObject : public RefObject +{ +protected: + std::atomic<uint32_t> comRefCount; + +public: + ComObject() + : comRefCount(0) + {} + ComObject(const ComObject&) : comRefCount(0) {} + ComObject& operator=(const ComObject&) + { + comRefCount = 0; + return *this; + }; + virtual void comFree() {} + + uint32_t addRefImpl() + { + auto oldRefCount = comRefCount++; + if (oldRefCount == 0) + addReference(); + return oldRefCount + 1; + } + + uint32_t releaseImpl() + { + auto oldRefCount = comRefCount--; + if (oldRefCount == 1) + { + comFree(); + releaseReference(); + } + return oldRefCount - 1; + } +}; + +#define SLANG_COM_OBJECT_IUNKNOWN_QUERY_INTERFACE \ + SLANG_NO_THROW SlangResult SLANG_MCALL queryInterface(SlangUUID const& uuid, void** outObject) \ + SLANG_OVERRIDE \ + { \ + void* intf = getInterface(uuid); \ + if (intf) \ + { \ + addRef(); \ + *outObject = intf; \ + return SLANG_OK; \ + } \ + return SLANG_E_NO_INTERFACE; \ + } +#define SLANG_COM_OBJECT_IUNKNOWN_ADD_REF \ + SLANG_NO_THROW uint32_t SLANG_MCALL addRef() SLANG_OVERRIDE { return addRefImpl(); } +#define SLANG_COM_OBJECT_IUNKNOWN_RELEASE \ + SLANG_NO_THROW uint32_t SLANG_MCALL release() SLANG_OVERRIDE { return releaseImpl(); } +#define SLANG_COM_OBJECT_IUNKNOWN_ALL \ + SLANG_COM_OBJECT_IUNKNOWN_QUERY_INTERFACE \ + SLANG_COM_OBJECT_IUNKNOWN_ADD_REF \ + SLANG_COM_OBJECT_IUNKNOWN_RELEASE + +} // namespace Slang + +#endif |