Commit 1b0f79ee by Geoff Lang Committed by Commit Bot

Vulkan: Use atomics in SerialFactory.

This allows serials to be generated from multiple threads without locking for very little/no cost. BUG=angleproject:2464 Change-Id: Id61d170e7a985c3100da0057156859ffcb083dad Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1516514 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org>
parent 29ac274f
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <cstdint> #include <cstdint>
#include <atomic>
#include <limits> #include <limits>
#include <map> #include <map>
...@@ -61,8 +62,6 @@ class ResourceSerial ...@@ -61,8 +62,6 @@ class ResourceSerial
uintptr_t mValue; uintptr_t mValue;
}; };
class SerialFactory;
class Serial final class Serial final
{ {
public: public:
...@@ -93,27 +92,32 @@ class Serial final ...@@ -93,27 +92,32 @@ class Serial final
constexpr uint64_t getValue() const { return mValue; } constexpr uint64_t getValue() const { return mValue; }
private: private:
friend class SerialFactory; template <typename T>
friend class SerialFactoryBase;
constexpr explicit Serial(uint64_t value) : mValue(value) {} constexpr explicit Serial(uint64_t value) : mValue(value) {}
uint64_t mValue; uint64_t mValue;
static constexpr uint64_t kInvalid = 0; static constexpr uint64_t kInvalid = 0;
}; };
class SerialFactory final : angle::NonCopyable template <typename SerialBaseType>
class SerialFactoryBase final : angle::NonCopyable
{ {
public: public:
SerialFactory() : mSerial(1) {} SerialFactoryBase() : mSerial(1) {}
Serial generate() Serial generate()
{ {
ASSERT(mSerial != std::numeric_limits<uint64_t>::max()); ASSERT(mSerial + 1 > mSerial);
return Serial(mSerial++); return Serial(mSerial++);
} }
private: private:
uint64_t mSerial; SerialBaseType mSerial;
}; };
using SerialFactory = SerialFactoryBase<uint64_t>;
using AtomicSerialFactory = SerialFactoryBase<std::atomic<uint64_t>>;
using MipGenerationFunction = void (*)(size_t sourceWidth, using MipGenerationFunction = void (*)(size_t sourceWidth,
size_t sourceHeight, size_t sourceHeight,
size_t sourceDepth, size_t sourceDepth,
......
...@@ -187,8 +187,8 @@ class RendererVk : angle::NonCopyable ...@@ -187,8 +187,8 @@ class RendererVk : angle::NonCopyable
uint32_t mCurrentQueueFamilyIndex; uint32_t mCurrentQueueFamilyIndex;
uint32_t mMaxVertexAttribDivisor; uint32_t mMaxVertexAttribDivisor;
VkDevice mDevice; VkDevice mDevice;
SerialFactory mQueueSerialFactory; AtomicSerialFactory mQueueSerialFactory;
SerialFactory mShaderSerialFactory; AtomicSerialFactory mShaderSerialFactory;
Serial mCurrentQueueSerial; Serial mCurrentQueueSerial;
bool mDeviceLost; bool mDeviceLost;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment