Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #461 from degasus/streambuffer_opts 
OGL StreamBuffer optimizations
  • Loading branch information
@neobrain
neobrain committed Jun 5, 2014
2 parents e2cfb7f + d9eafd9 commit 40031c9
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 58 deletions.
78 changes: 31 additions & 47 deletions Source/Core/VideoBackends/OGL/StreamBuffer.cpp
View file
Expand Up @@ -22,13 +22,12 @@ static u32 genBuffer()
return id;
}

StreamBuffer::StreamBuffer(u32 type, size_t size)
: m_buffer(genBuffer()), m_buffertype(type), m_size(size)
StreamBuffer::StreamBuffer(u32 type, u32 size)
: m_buffer(genBuffer()), m_buffertype(type), m_size(ROUND_UP_POW2(size)), m_bit_per_slot(Log2(ROUND_UP_POW2(size) / SYNC_POINTS))
{
m_iterator = 0;
m_used_iterator = 0;
m_free_iterator = 0;
fences = nullptr;
}


Expand Down Expand Up @@ -60,37 +59,35 @@ StreamBuffer::~StreamBuffer()
* As ring buffers have an ugly behavoir on rollover, have fun to read this code ;)
*/

#define SLOT(x) ((x)*SYNC_POINTS/m_size)
static const u32 SYNC_POINTS = 16;
void StreamBuffer::CreateFences()
{
fences = new GLsync[SYNC_POINTS];
for (u32 i=0; i<SYNC_POINTS; i++)
for (int i=0; i<SYNC_POINTS; i++)
{
fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
}
}
void StreamBuffer::DeleteFences()
{
for (size_t i = SLOT(m_free_iterator) + 1; i < SYNC_POINTS; i++)
for (int i = SLOT(m_free_iterator) + 1; i < SYNC_POINTS; i++)
{
glDeleteSync(fences[i]);
}
for (size_t i = 0; i < SLOT(m_iterator); i++)
for (int i = 0; i < SLOT(m_iterator); i++)
{
glDeleteSync(fences[i]);
}
delete [] fences;
}
void StreamBuffer::AllocMemory(size_t size)
void StreamBuffer::AllocMemory(u32 size)
{
// insert waiting slots for used memory
for (size_t i = SLOT(m_used_iterator); i < SLOT(m_iterator); i++)
for (int i = SLOT(m_used_iterator); i < SLOT(m_iterator); i++)
{
fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
}
m_used_iterator = m_iterator;

// wait for new slots to end of buffer
for (size_t i = SLOT(m_free_iterator) + 1; i <= SLOT(m_iterator + size) && i < SYNC_POINTS; i++)
for (int i = SLOT(m_free_iterator) + 1; i <= SLOT(m_iterator + size) && i < SYNC_POINTS; i++)
{
glClientWaitSync(fences[i], GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
glDeleteSync(fences[i]);
Expand All @@ -101,7 +98,7 @@ void StreamBuffer::AllocMemory(size_t size)
if (m_iterator + size >= m_size) {

// insert waiting slots in unused space at the end of the buffer
for (size_t i = SLOT(m_used_iterator); i < SYNC_POINTS; i++)
for (int i = SLOT(m_used_iterator); i < SYNC_POINTS; i++)
{
fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
}
Expand All @@ -110,23 +107,14 @@ void StreamBuffer::AllocMemory(size_t size)
m_used_iterator = m_iterator = 0; // offset 0 is always aligned

// wait for space at the start
for (u32 i = 0; i <= SLOT(m_iterator + size); i++)
for (int i = 0; i <= SLOT(m_iterator + size); i++)
{
glClientWaitSync(fences[i], GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
glDeleteSync(fences[i]);
}
m_free_iterator = m_iterator + size;
}
}
#undef SLOT

void StreamBuffer::Align(u32 stride)
{
if (m_iterator && stride) {
m_iterator--;
m_iterator = m_iterator - (m_iterator % stride) + stride;
}
}

/* The usual way to stream data to the gpu.
* Described here: https://www.opengl.org/wiki/Buffer_Object_Streaming#Unsynchronized_buffer_mapping
Expand All @@ -138,16 +126,15 @@ void StreamBuffer::Align(u32 stride)
class MapAndOrphan : public StreamBuffer
{
public:
MapAndOrphan(u32 type, size_t size) : StreamBuffer(type, size) {
MapAndOrphan(u32 type, u32 size) : StreamBuffer(type, size) {
glBindBuffer(m_buffertype, m_buffer);
glBufferData(m_buffertype, m_size, nullptr, GL_STREAM_DRAW);
}

~MapAndOrphan() {
}

std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
Align(stride);
std::pair<u8*, u32> Map(u32 size) override {
if (m_iterator + size >= m_size) {
glBufferData(m_buffertype, m_size, nullptr, GL_STREAM_DRAW);
m_iterator = 0;
Expand All @@ -157,7 +144,7 @@ class MapAndOrphan : public StreamBuffer
return std::make_pair(pointer, m_iterator);
}

void Unmap(size_t used_size) override {
void Unmap(u32 used_size) override {
glFlushMappedBufferRange(m_buffertype, 0, used_size);
glUnmapBuffer(m_buffertype);
m_iterator += used_size;
Expand All @@ -174,7 +161,7 @@ class MapAndOrphan : public StreamBuffer
class MapAndSync : public StreamBuffer
{
public:
MapAndSync(u32 type, size_t size) : StreamBuffer(type, size) {
MapAndSync(u32 type, u32 size) : StreamBuffer(type, size) {
CreateFences();
glBindBuffer(m_buffertype, m_buffer);
glBufferData(m_buffertype, m_size, nullptr, GL_STREAM_DRAW);
Expand All @@ -184,15 +171,14 @@ class MapAndSync : public StreamBuffer
DeleteFences();
}

std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
Align(stride);
std::pair<u8*, u32> Map(u32 size) override {
AllocMemory(size);
u8* pointer = (u8*)glMapBufferRange(m_buffertype, m_iterator, size,
GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
return std::make_pair(pointer, m_iterator);
}

void Unmap(size_t used_size) override {
void Unmap(u32 used_size) override {
glFlushMappedBufferRange(m_buffertype, 0, used_size);
glUnmapBuffer(m_buffertype);
m_iterator += used_size;
Expand All @@ -215,7 +201,7 @@ class MapAndSync : public StreamBuffer
class BufferStorage : public StreamBuffer
{
public:
BufferStorage(u32 type, size_t size) : StreamBuffer(type, size) {
BufferStorage(u32 type, u32 size) : StreamBuffer(type, size) {
CreateFences();
glBindBuffer(m_buffertype, m_buffer);

Expand All @@ -234,13 +220,12 @@ class BufferStorage : public StreamBuffer
glBindBuffer(m_buffertype, 0);
}

std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
Align(stride);
std::pair<u8*, u32> Map(u32 size) override {
AllocMemory(size);
return std::make_pair(m_pointer + m_iterator, m_iterator);
}

void Unmap(size_t used_size) override {
void Unmap(u32 used_size) override {
glFlushMappedBufferRange(m_buffertype, m_iterator, used_size);
m_iterator += used_size;
}
Expand All @@ -258,7 +243,7 @@ class BufferStorage : public StreamBuffer
class PinnedMemory : public StreamBuffer
{
public:
PinnedMemory(u32 type, size_t size) : StreamBuffer(type, size) {
PinnedMemory(u32 type, u32 size) : StreamBuffer(type, size) {
CreateFences();
m_pointer = (u8*)AllocateAlignedMemory(ROUND_UP(m_size,ALIGN_PINNED_MEMORY), ALIGN_PINNED_MEMORY );
glBindBuffer(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, m_buffer);
Expand All @@ -275,13 +260,12 @@ class PinnedMemory : public StreamBuffer
m_pointer = nullptr;
}

std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
Align(stride);
std::pair<u8*, u32> Map(u32 size) override {
AllocMemory(size);
return std::make_pair(m_pointer + m_iterator, m_iterator);
}

void Unmap(size_t used_size) override {
void Unmap(u32 used_size) override {
m_iterator += used_size;
}

Expand All @@ -297,7 +281,7 @@ class PinnedMemory : public StreamBuffer
class BufferSubData : public StreamBuffer
{
public:
BufferSubData(u32 type, size_t size) : StreamBuffer(type, size) {
BufferSubData(u32 type, u32 size) : StreamBuffer(type, size) {
glBindBuffer(m_buffertype, m_buffer);
glBufferData(m_buffertype, size, nullptr, GL_STATIC_DRAW);
m_pointer = new u8[m_size];
Expand All @@ -307,11 +291,11 @@ class BufferSubData : public StreamBuffer
delete [] m_pointer;
}

std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
std::pair<u8*, u32> Map(u32 size) override {
return std::make_pair(m_pointer, 0);
}

void Unmap(size_t used_size) override {
void Unmap(u32 used_size) override {
glBufferSubData(m_buffertype, 0, used_size, m_pointer);
}

Expand All @@ -326,7 +310,7 @@ class BufferSubData : public StreamBuffer
class BufferData : public StreamBuffer
{
public:
BufferData(u32 type, size_t size) : StreamBuffer(type, size) {
BufferData(u32 type, u32 size) : StreamBuffer(type, size) {
glBindBuffer(m_buffertype, m_buffer);
m_pointer = new u8[m_size];
}
Expand All @@ -335,19 +319,19 @@ class BufferData : public StreamBuffer
delete [] m_pointer;
}

std::pair<u8*, size_t> Map(size_t size, u32 stride) override {
std::pair<u8*, u32> Map(u32 size) override {
return std::make_pair(m_pointer, 0);
}

void Unmap(size_t used_size) override {
void Unmap(u32 used_size) override {
glBufferData(m_buffertype, used_size, m_pointer, GL_STREAM_DRAW);
}

u8* m_pointer;
};

// choose best streaming library based on the supported extensions and known issues
StreamBuffer* StreamBuffer::Create(u32 type, size_t size)
StreamBuffer* StreamBuffer::Create(u32 type, u32 size)
{
// without basevertex support, only streaming methods whith uploads everything to zero works fine:
if (!g_ogl_config.bSupportsGLBaseVertex)
Expand Down
35 changes: 24 additions & 11 deletions Source/Core/VideoBackends/OGL/StreamBuffer.h
View file
Expand Up @@ -15,7 +15,7 @@ namespace OGL
class StreamBuffer {

public:
static StreamBuffer* Create(u32 type, size_t size);
static StreamBuffer* Create(u32 type, u32 size);
virtual ~StreamBuffer();

/* This mapping function will return a pair of:
Expand All @@ -26,27 +26,40 @@ class StreamBuffer {
* Mapping invalidates the current buffer content,
* so it isn't allowed to access the old content any more.
*/
virtual std::pair<u8*, size_t> Map(size_t size, u32 stride = 0) = 0;
virtual void Unmap(size_t used_size) = 0;
virtual std::pair<u8*, u32> Map(u32 size) = 0;
virtual void Unmap(u32 used_size) = 0;

inline std::pair<u8*, u32> Map(u32 size, u32 stride)
{
u32 padding = m_iterator % stride;
if (padding)
{
m_iterator += stride - padding;
}
return Map(size);
}

const u32 m_buffer;

protected:
StreamBuffer(u32 type, size_t size);
StreamBuffer(u32 type, u32 size);
void CreateFences();
void DeleteFences();
void AllocMemory(size_t size);
void Align(u32 stride);
void AllocMemory(u32 size);

const u32 m_buffertype;
const size_t m_size;
const u32 m_size;

size_t m_iterator;
size_t m_used_iterator;
size_t m_free_iterator;
u32 m_iterator;
u32 m_used_iterator;
u32 m_free_iterator;

private:
GLsync *fences;
static const int SYNC_POINTS = 16;
inline int SLOT(u32 x) const { return x >> m_bit_per_slot; }
const int m_bit_per_slot;

GLsync fences[SYNC_POINTS];
};

}

0 comments on commit 40031c9

Please sign in to comment.