AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-06-13 06:33:29 +00:00
Code Issues Projects Releases Wiki Activity

Windows fixes

Browse Source
This commit is contained in:
Jack Andersen 2016-12-10 15:53:39 -10:00
parent a9322292f5
commit 0384119bd4
4 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
specter/include/specter/UniformBufferPool.hpp
View File

@ -12,7 +12,7 @@ namespace specter
#define SPECTER_UBUFPOOL_ALLOCATION_BLOCK 262144 #define SPECTER_UBUFPOOL_ALLOCATION_BLOCK 262144
/** This class provides a uniform structure for packing instanced uniform-buffer /** This class provides a uniform structure for packing instanced uniform-buffer
* data with consistent stride into a vector of 64K 'Buckets'. * data with consistent stride into a vector of 256K 'Buckets'.
* *
* This results in a space-efficient way of managing GPU data of things like UI * This results in a space-efficient way of managing GPU data of things like UI
* widgets. These can potentially have numerous binding instances, so this avoids * widgets. These can potentially have numerous binding instances, so this avoids
@ -21,7 +21,11 @@ template <typename UniformStruct>
class UniformBufferPool class UniformBufferPool
{ {
/* Resolve div_t type using ssize_t as basis */ /* Resolve div_t type using ssize_t as basis */
#if _WIN32
using IndexTp = SSIZE_T;
#else
using IndexTp = ssize_t; using IndexTp = ssize_t;
#endif
struct InvalidTp {}; struct InvalidTp {};
using DivTp = std::conditional_t<std::is_same<IndexTp, long long>::value, std::lldiv_t, using DivTp = std::conditional_t<std::is_same<IndexTp, long long>::value, std::lldiv_t,
std::conditional_t<std::is_same<IndexTp, long>::value, std::ldiv_t, std::conditional_t<std::is_same<IndexTp, long>::value, std::ldiv_t,
@ -32,10 +36,10 @@ class UniformBufferPool
static constexpr IndexTp m_stride = ROUND_UP_256(sizeof(UniformStruct)); static constexpr IndexTp m_stride = ROUND_UP_256(sizeof(UniformStruct));
static_assert(m_stride <= SPECTER_UBUFPOOL_ALLOCATION_BLOCK, "Stride too large for uniform pool"); static_assert(m_stride <= SPECTER_UBUFPOOL_ALLOCATION_BLOCK, "Stride too large for uniform pool");
/** Number of rounded elements per 64K bucket */ /** Number of rounded elements per 256K bucket */
static constexpr IndexTp m_countPerBucket = SPECTER_UBUFPOOL_ALLOCATION_BLOCK / m_stride; static constexpr IndexTp m_countPerBucket = SPECTER_UBUFPOOL_ALLOCATION_BLOCK / m_stride;
/** Buffer size per bucket (ideally 64K) */ /** Buffer size per bucket (ideally 256K) */
static constexpr IndexTp m_sizePerBucket = m_stride * m_countPerBucket; static constexpr IndexTp m_sizePerBucket = m_stride * m_countPerBucket;
/** BitVector indicating free allocation blocks */ /** BitVector indicating free allocation blocks */
@ -51,20 +55,20 @@ class UniformBufferPool
struct Bucket struct Bucket
{ {
boo::IGraphicsBufferD* buffer; boo::IGraphicsBufferD* buffer;
std::unique_ptr<uint8_t[]> cpuBuffer; uint8_t* cpuBuffer = nullptr;
bool dirty = false; bool dirty = false;
Bucket(const Bucket& other) = delete; Bucket(const Bucket& other) = delete;
Bucket& operator=(const Bucket& other) = delete; Bucket& operator=(const Bucket& other) = delete;
Bucket(Bucket&& other) = default; Bucket(Bucket&& other) = default;
Bucket& operator=(Bucket&& other) = default; Bucket& operator=(Bucket&& other) = default;
Bucket(UniformBufferPool& pool) Bucket(UniformBufferPool& pool)
: cpuBuffer(new uint8_t[pool.m_sizePerBucket])
{ {
buffer = pool.m_token.newPoolBuffer(boo::BufferUse::Uniform, pool.m_stride, pool.m_countPerBucket); buffer = pool.m_token.newPoolBuffer(boo::BufferUse::Uniform, pool.m_stride, pool.m_countPerBucket);
} }
void updateBuffer(UniformBufferPool& pool) void updateBuffer()
{ {
buffer->load(cpuBuffer.get(), pool.m_sizePerBucket); buffer->unmap();
cpuBuffer = nullptr;
dirty = false; dirty = false;
} }
}; };
@ -118,6 +122,8 @@ public:
UniformStruct& access() UniformStruct& access()
{ {
Bucket& bucket = m_pool.m_buckets[m_div.quot]; Bucket& bucket = m_pool.m_buckets[m_div.quot];
if (!bucket.cpuBuffer)
bucket.cpuBuffer = reinterpret_cast<uint8_t*>(bucket.buffer->map(m_sizePerBucket));
bucket.dirty = true; bucket.dirty = true;
return reinterpret_cast<UniformStruct&>(bucket.cpuBuffer[m_div.rem * m_pool.m_stride]); return reinterpret_cast<UniformStruct&>(bucket.cpuBuffer[m_div.rem * m_pool.m_stride]);
} }
@ -138,7 +144,7 @@ public:
{ {
for (Bucket& bucket : m_buckets) for (Bucket& bucket : m_buckets)
if (bucket.dirty) if (bucket.dirty)
bucket.updateBuffer(*this); bucket.updateBuffer();
} }
/** Allocate free block into client-owned Token */ /** Allocate free block into client-owned Token */

22
specter/include/specter/VertexBufferPool.hpp
View File

@ -12,7 +12,7 @@ namespace specter
#define SPECTER_VBUFPOOL_ALLOCATION_BLOCK 262144 #define SPECTER_VBUFPOOL_ALLOCATION_BLOCK 262144
/** This class provides a uniform structure for packing instanced vertex-buffer /** This class provides a uniform structure for packing instanced vertex-buffer
* data with consistent stride into a vector of 64K 'Buckets'. * data with consistent stride into a vector of 256K 'Buckets'.
* *
* This results in a space-efficient way of managing GPU data of things like UI * This results in a space-efficient way of managing GPU data of things like UI
* widgets. These can potentially have numerous binding instances, so this avoids * widgets. These can potentially have numerous binding instances, so this avoids
@ -21,7 +21,11 @@ template <typename VertStruct>
class VertexBufferPool class VertexBufferPool
{ {
/* Resolve div_t type using ssize_t as basis */ /* Resolve div_t type using ssize_t as basis */
#if _WIN32
using IndexTp = SSIZE_T;
#else
using IndexTp = ssize_t; using IndexTp = ssize_t;
#endif
struct InvalidTp {}; struct InvalidTp {};
using DivTp = std::conditional_t<std::is_same<IndexTp, long long>::value, std::lldiv_t, using DivTp = std::conditional_t<std::is_same<IndexTp, long long>::value, std::lldiv_t,
std::conditional_t<std::is_same<IndexTp, long>::value, std::ldiv_t, std::conditional_t<std::is_same<IndexTp, long>::value, std::ldiv_t,
@ -32,10 +36,10 @@ class VertexBufferPool
static constexpr IndexTp m_stride = sizeof(VertStruct); static constexpr IndexTp m_stride = sizeof(VertStruct);
static_assert(m_stride <= SPECTER_VBUFPOOL_ALLOCATION_BLOCK, "Stride too large for vertex pool"); static_assert(m_stride <= SPECTER_VBUFPOOL_ALLOCATION_BLOCK, "Stride too large for vertex pool");
/** Number of elements per 64K bucket */ /** Number of elements per 256K bucket */
static constexpr IndexTp m_countPerBucket = SPECTER_VBUFPOOL_ALLOCATION_BLOCK / m_stride; static constexpr IndexTp m_countPerBucket = SPECTER_VBUFPOOL_ALLOCATION_BLOCK / m_stride;
/** Buffer size per bucket (ideally 64K) */ /** Buffer size per bucket (ideally 256K) */
static constexpr IndexTp m_sizePerBucket = m_stride * m_countPerBucket; static constexpr IndexTp m_sizePerBucket = m_stride * m_countPerBucket;
/** BitVector indicating free allocation elements */ /** BitVector indicating free allocation elements */
@ -51,20 +55,20 @@ class VertexBufferPool
struct Bucket struct Bucket
{ {
boo::IGraphicsBufferD* buffer; boo::IGraphicsBufferD* buffer;
std::unique_ptr<uint8_t[]> cpuBuffer; uint8_t* cpuBuffer = nullptr;
bool dirty = false; bool dirty = false;
Bucket(const Bucket& other) = delete; Bucket(const Bucket& other) = delete;
Bucket& operator=(const Bucket& other) = delete; Bucket& operator=(const Bucket& other) = delete;
Bucket(Bucket&& other) = default; Bucket(Bucket&& other) = default;
Bucket& operator=(Bucket&& other) = default; Bucket& operator=(Bucket&& other) = default;
Bucket(VertexBufferPool& pool) Bucket(VertexBufferPool& pool)
: cpuBuffer(new uint8_t[pool.m_sizePerBucket])
{ {
buffer = pool.m_token.newPoolBuffer(boo::BufferUse::Vertex, pool.m_stride, pool.m_countPerBucket); buffer = pool.m_token.newPoolBuffer(boo::BufferUse::Vertex, pool.m_stride, pool.m_countPerBucket);
} }
void updateBuffer(VertexBufferPool& pool) void updateBuffer()
{ {
buffer->load(cpuBuffer.get(), pool.m_sizePerBucket); buffer->unmap();
cpuBuffer = nullptr;
dirty = false; dirty = false;
} }
}; };
@ -119,6 +123,8 @@ public:
VertStruct* access() VertStruct* access()
{ {
Bucket& bucket = m_pool.m_buckets[m_div.quot]; Bucket& bucket = m_pool.m_buckets[m_div.quot];
if (!bucket.cpuBuffer)
bucket.cpuBuffer = reinterpret_cast<uint8_t*>(bucket.buffer->map(m_sizePerBucket));
bucket.dirty = true; bucket.dirty = true;
return reinterpret_cast<VertStruct*>(&bucket.cpuBuffer[m_div.rem * m_pool.m_stride]); return reinterpret_cast<VertStruct*>(&bucket.cpuBuffer[m_div.rem * m_pool.m_stride]);
} }
@ -139,7 +145,7 @@ public:
{ {
for (Bucket& bucket : m_buckets) for (Bucket& bucket : m_buckets)
if (bucket.dirty) if (bucket.dirty)
bucket.updateBuffer(*this); bucket.updateBuffer();
} }
/** Allocate free block into client-owned Token */ /** Allocate free block into client-owned Token */

4
specter/lib/TextView.cpp
View File

@ -304,7 +304,7 @@ TextView::TextView(ViewResources& res,
m_fontAtlas(font), m_fontAtlas(font),
m_align(align) m_align(align)
{ {
if (VertexBufferPool<RenderGlyph>::bucketCapacity() < capacity) if (size_t(VertexBufferPool<RenderGlyph>::bucketCapacity()) < capacity)
Log.report(logvisor::Fatal, "bucket overflow [%" PRISize "/%" PRISize "]", Log.report(logvisor::Fatal, "bucket overflow [%" PRISize "/%" PRISize "]",
capacity, VertexBufferPool<RenderGlyph>::bucketCapacity()); capacity, VertexBufferPool<RenderGlyph>::bucketCapacity());
@ -324,7 +324,7 @@ TextView::TextView(ViewResources& res,
auto vBufInfo = m_glyphBuf->getBufferInfo(); auto vBufInfo = m_glyphBuf->getBufferInfo();
auto uBufInfo = m_viewVertBlockBuf->getBufferInfo(); auto uBufInfo = m_viewVertBlockBuf->getBufferInfo();
boo::IGraphicsBuffer* uBufs[] = {uBufInfo.first}; boo::IGraphicsBuffer* uBufs[] = {uBufInfo.first};
size_t uBufOffs[] = {uBufInfo.second}; size_t uBufOffs[] = {size_t(uBufInfo.second)};
size_t uBufSizes[] = {sizeof(ViewBlock)}; size_t uBufSizes[] = {sizeof(ViewBlock)};
boo::ITexture* texs[] = {m_fontAtlas.texture()}; boo::ITexture* texs[] = {m_fontAtlas.texture()};

4
specter/lib/View.cpp
View File

@ -390,7 +390,7 @@ void View::VertexBufferBindingSolid::init(boo::IGraphicsDataFactory::Context& ct
auto uBufInfo = viewBlockBuf.getBufferInfo(); auto uBufInfo = viewBlockBuf.getBufferInfo();
boo::IGraphicsBuffer* bufs[] = {uBufInfo.first}; boo::IGraphicsBuffer* bufs[] = {uBufInfo.first};
size_t bufOffs[] = {uBufInfo.second}; size_t bufOffs[] = {size_t(uBufInfo.second)};
size_t bufSizes[] = {sizeof(ViewBlock)}; size_t bufSizes[] = {sizeof(ViewBlock)};
if (!res.m_viewRes.m_solidVtxFmt) if (!res.m_viewRes.m_solidVtxFmt)
@ -426,7 +426,7 @@ void View::VertexBufferBindingTex::init(boo::IGraphicsDataFactory::Context& ctx,
auto uBufInfo = viewBlockBuf.getBufferInfo(); auto uBufInfo = viewBlockBuf.getBufferInfo();
boo::IGraphicsBuffer* bufs[] = {uBufInfo.first}; boo::IGraphicsBuffer* bufs[] = {uBufInfo.first};
size_t bufOffs[] = {uBufInfo.second}; size_t bufOffs[] = {size_t(uBufInfo.second)};
size_t bufSizes[] = {sizeof(ViewBlock)}; size_t bufSizes[] = {sizeof(ViewBlock)};
boo::ITexture* tex[] = {texture}; boo::ITexture* tex[] = {texture};