diff options
author | Miguel Costa <miguel.costa@qt.io> | 2018-06-26 16:56:45 +0200 |
---|---|---|
committer | Andre de la Rocha <andre.rocha@qt.io> | 2018-10-13 21:36:35 +0000 |
commit | 0a7aebadfbb3534284546aa3ca8612314c08f136 (patch) | |
tree | e94ee33ae3bb9b96fc3047c6455d47ac4920bfbf /src/3rdparty/angle/src/common/MemoryBuffer.h | |
parent | 656e89f875ad2008ca16cc673b687a22daa294c9 (diff) |
Update ANGLE to chromium/3280
Change-Id: I0802c0d7486f772d361f87a544d6c5af937f4ca1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/3rdparty/angle/src/common/MemoryBuffer.h')
-rw-r--r-- | src/3rdparty/angle/src/common/MemoryBuffer.h | 55 |
1 files changed, 47 insertions, 8 deletions
diff --git a/src/3rdparty/angle/src/common/MemoryBuffer.h b/src/3rdparty/angle/src/common/MemoryBuffer.h index ec621cbca7..f76b9ee62e 100644 --- a/src/3rdparty/angle/src/common/MemoryBuffer.h +++ b/src/3rdparty/angle/src/common/MemoryBuffer.h @@ -7,32 +7,71 @@ #ifndef COMMON_MEMORYBUFFER_H_ #define COMMON_MEMORYBUFFER_H_ +#include "common/Optional.h" #include "common/angleutils.h" +#include "common/debug.h" -#include <cstddef> #include <stdint.h> +#include <cstddef> -namespace rx +namespace angle { -class MemoryBuffer : angle::NonCopyable +class MemoryBuffer final : NonCopyable { public: MemoryBuffer(); ~MemoryBuffer(); + MemoryBuffer(MemoryBuffer &&other); + MemoryBuffer &operator=(MemoryBuffer &&other); + bool resize(size_t size); - size_t size() const; + size_t size() const { return mSize; } bool empty() const { return mSize == 0; } - const uint8_t *data() const; - uint8_t *data(); + const uint8_t *data() const { return mData; } + uint8_t *data() + { + ASSERT(mData); + return mData; + } + + void fill(uint8_t datum); private: size_t mSize; uint8_t *mData; }; -} +class ScratchBuffer final : NonCopyable +{ + public: + // If we request a scratch buffer requesting a smaller size this many times, release and + // recreate the scratch buffer. This ensures we don't have a degenerate case where we are stuck + // hogging memory. + ScratchBuffer(uint32_t lifetime); + ~ScratchBuffer(); + + // Returns true with a memory buffer of the requested size, or false on failure. + bool get(size_t requestedSize, MemoryBuffer **memoryBufferOut); + + // Same as get, but ensures new values are initialized to a fixed constant. + bool getInitialized(size_t requestedSize, MemoryBuffer **memoryBufferOut, uint8_t initValue); + + // Ticks the release counter for the scratch buffer. Also done implicitly in get(). + void tick(); + + void clear(); + + private: + bool getImpl(size_t requestedSize, MemoryBuffer **memoryBufferOut, Optional<uint8_t> initValue); + + const uint32_t mLifetime; + uint32_t mResetCounter; + MemoryBuffer mScratchMemory; +}; + +} // namespace angle -#endif // COMMON_MEMORYBUFFER_H_ +#endif // COMMON_MEMORYBUFFER_H_ |