stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-20 19:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Place all vertex buffers in the same GPU vertex buffer so that the 3D scene only contains 2 vertex buffer binds per frame

Browse source
This commit is contained in:
Magnus Norddahl 2019-12-18 02:27:49 +01:00
parent b3a4f563e9
commit b70b114a6b
4 changed files with 113 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
Source/Native/RenderDevice.cpp
View file

@ -7,6 +7,7 @@
#include "ShaderManager.h"
#include <stdexcept>
#include <cstdarg>
#include <algorithm>
static bool GLLogStarted = false;
static void APIENTRY GLLogCallback(GLenum source, GLenum type, GLuint id,
@ -39,7 +40,17 @@ RenderDevice::RenderDevice(void* disp, void* window)
glGenBuffers(1, &mStreamVertexBuffer);
glBindVertexArray(mStreamVAO);
glBindBuffer(GL_ARRAY_BUFFER, mStreamVertexBuffer);
VertexBuffer::SetupFlatVAO();
SharedVertexBuffer::SetupFlatVAO();
int i = 0;
for (auto& sharedbuf : mSharedVertexBuffers)
{
sharedbuf.reset(new SharedVertexBuffer((VertexFormat)i, (int64_t)16 * 1024 * 1024));
glBindBuffer(GL_ARRAY_BUFFER, sharedbuf->GetBuffer());
glBufferData(GL_ARRAY_BUFFER, sharedbuf->Size, nullptr, GL_STATIC_DRAW);
i++;
}
glBindBuffer(GL_ARRAY_BUFFER, 0);
mShaderManager = std::make_unique<ShaderManager>();
@ -56,6 +67,13 @@ RenderDevice::~RenderDevice()
Context->MakeCurrent();
glDeleteBuffers(1, &mStreamVertexBuffer);
glDeleteVertexArrays(1, &mStreamVAO);
for (auto& sharedbuf : mSharedVertexBuffers)
{
GLuint handle = sharedbuf->GetBuffer();
glDeleteBuffers(1, &handle);
handle = sharedbuf->GetVAO();
glDeleteVertexArrays(1, &handle);
}
mShaderManager->ReleaseResources();
Context->ClearCurrent();
}
@ -63,11 +81,25 @@ RenderDevice::~RenderDevice()
void RenderDevice::SetVertexBuffer(VertexBuffer* buffer)
{
if (mVertexBuffer != buffer)
if (buffer != nullptr)
{
mVertexBuffer = buffer;
mNeedApply = true;
mVertexBufferChanged = true;
mVertexBufferStartIndex = buffer->BufferStartIndex;
if (mVertexBuffer != (int)buffer->Format)
{
mVertexBuffer = (int)buffer->Format;
mNeedApply = true;
mVertexBufferChanged = true;
}
}
else
{
mVertexBufferStartIndex = 0;
if (mVertexBuffer != -1)
{
mVertexBuffer = -1;
mNeedApply = true;
mVertexBufferChanged = true;
}
}
}
@ -249,9 +281,8 @@ void RenderDevice::Draw(PrimitiveType type, int startIndex, int primitiveCount)
static const int toVertexCount[] = { 2, 3, 1 };
static const int toVertexStart[] = { 0, 0, 2 };
ApplyViewport();
if (mNeedApply) ApplyChanges();
glDrawArrays(modes[(int)type], startIndex, toVertexStart[(int)type] + primitiveCount * toVertexCount[(int)type]);
glDrawArrays(modes[(int)type], mVertexBufferStartIndex + startIndex, toVertexStart[(int)type] + primitiveCount * toVertexCount[(int)type]);
CheckGLError();
}
@ -261,9 +292,8 @@ void RenderDevice::DrawIndexed(PrimitiveType type, int startIndex, int primitive
static const int toVertexCount[] = { 2, 3, 1 };
static const int toVertexStart[] = { 0, 0, 2 };
ApplyViewport();
if (mNeedApply) ApplyChanges();
glDrawElements(modes[(int)type], toVertexStart[(int)type] + primitiveCount * toVertexCount[(int)type], GL_UNSIGNED_INT, (const void*)(startIndex * sizeof(uint32_t)));
glDrawElementsBaseVertex(modes[(int)type], toVertexStart[(int)type] + primitiveCount * toVertexCount[(int)type], GL_UNSIGNED_INT, (const void*)(startIndex * sizeof(uint32_t)), mVertexBufferStartIndex);
CheckGLError();
}
@ -275,11 +305,10 @@ void RenderDevice::DrawData(PrimitiveType type, int startIndex, int primitiveCou
int vertcount = toVertexStart[(int)type] + primitiveCount * toVertexCount[(int)type];
ApplyViewport();
if (mNeedApply) ApplyChanges();
glBindBuffer(GL_ARRAY_BUFFER, mStreamVertexBuffer);
glBufferData(GL_ARRAY_BUFFER, vertcount * (size_t)VertexBuffer::FlatStride, static_cast<const uint8_t*>(data) + startIndex * (size_t)VertexBuffer::FlatStride, GL_STREAM_DRAW);
glBufferData(GL_ARRAY_BUFFER, vertcount * (size_t)SharedVertexBuffer::FlatStride, static_cast<const uint8_t*>(data) + startIndex * (size_t)SharedVertexBuffer::FlatStride, GL_STREAM_DRAW);
glBindVertexArray(mStreamVAO);
glDrawArrays(modes[(int)type], 0, vertcount);
ApplyVertexBuffer();
@ -389,11 +418,43 @@ void RenderDevice::CopyTexture(Texture* dst, CubeMapFace face)
void RenderDevice::SetVertexBufferData(VertexBuffer* buffer, void* data, int64_t size, VertexFormat format)
{
if (!mContextIsCurrent) Context->MakeCurrent();
buffer->Format = format;
GLint oldbinding = 0;
glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &oldbinding);
glBindBuffer(GL_ARRAY_BUFFER, buffer->GetBuffer());
glBufferData(GL_ARRAY_BUFFER, size, data, GL_STATIC_DRAW);
auto& sharedbuf = mSharedVertexBuffers[(int)format];
if (sharedbuf->NextPos + size > sharedbuf->Size)
{
std::unique_ptr<SharedVertexBuffer> old = std::move(sharedbuf);
sharedbuf.reset(new SharedVertexBuffer(format, old->Size * 2));
sharedbuf->NextPos = old->NextPos;
glBindBuffer(GL_ARRAY_BUFFER, sharedbuf->GetBuffer());
glBufferData(GL_ARRAY_BUFFER, sharedbuf->Size, nullptr, GL_STATIC_DRAW);
glBindBuffer(GL_COPY_READ_BUFFER, old->GetBuffer());
glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_ARRAY_BUFFER, 0, 0, old->Size);
glBindBuffer(GL_COPY_READ_BUFFER, 0);
GLuint handle = old->GetBuffer();
glDeleteBuffers(1, &handle);
handle = old->GetVAO();
glDeleteVertexArrays(1, &handle);
mVertexBufferChanged = true;
mNeedApply = true;
}
else
{
glBindBuffer(GL_ARRAY_BUFFER, sharedbuf->GetBuffer());
}
buffer->Format = format;
buffer->BufferOffset = sharedbuf->NextPos;
buffer->BufferStartIndex = buffer->BufferOffset / (format == VertexFormat::Flat ? SharedVertexBuffer::FlatStride : SharedVertexBuffer::WorldStride);
sharedbuf->NextPos += size;
glBufferSubData(GL_ARRAY_BUFFER, buffer->BufferOffset, size, data);
glBindBuffer(GL_ARRAY_BUFFER, oldbinding);
CheckGLError();
if (!mContextIsCurrent) Context->ClearCurrent();
@ -404,8 +465,8 @@ void RenderDevice::SetVertexBufferSubdata(VertexBuffer* buffer, int64_t destOffs
if (!mContextIsCurrent) Context->MakeCurrent();
GLint oldbinding = 0;
glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &oldbinding);
glBindBuffer(GL_ARRAY_BUFFER, buffer->GetBuffer());
glBufferSubData(GL_ARRAY_BUFFER, destOffset, size, data);
glBindBuffer(GL_ARRAY_BUFFER, mSharedVertexBuffers[(int)buffer->Format]->GetBuffer());
glBufferSubData(GL_ARRAY_BUFFER, buffer->BufferOffset + destOffset, size, data);
glBindBuffer(GL_ARRAY_BUFFER, oldbinding);
CheckGLError();
if (!mContextIsCurrent) Context->ClearCurrent();
@ -671,8 +732,8 @@ void RenderDevice::ApplyIndexBuffer()
void RenderDevice::ApplyVertexBuffer()
{
if (mVertexBuffer)
glBindVertexArray(mVertexBuffer->GetVAO());
if (mVertexBuffer != -1)
glBindVertexArray(mSharedVertexBuffers[mVertexBuffer]->GetVAO());
mVertexBufferChanged = false;

7
Source/Native/RenderDevice.h
View file

@ -2,6 +2,7 @@
#include "OpenGLContext.h"
class SharedVertexBuffer;
class VertexBuffer;
class IndexBuffer;
class Texture;
@ -149,9 +150,13 @@ public:
TextureAddress AddressW = TextureAddress::Wrap;
} mTextureUnit;
VertexBuffer* mVertexBuffer = nullptr;
int mVertexBuffer = -1;
int64_t mVertexBufferStartIndex = 0;
IndexBuffer* mIndexBuffer = nullptr;
std::unique_ptr<SharedVertexBuffer> mSharedVertexBuffers[2];
std::unique_ptr<ShaderManager> mShaderManager;
ShaderName mShaderName = ShaderName::display2d_normal;

16
Source/Native/VertexBuffer.cpp
View file

@ -9,17 +9,23 @@ VertexBuffer::VertexBuffer()
VertexBuffer::~VertexBuffer()
{
// To do: move mBuffer to a delete list as this might be called by a finalizer in a different thread
// To do: release its slot in RenderDevice (note: this might be called by a finalizer in a different thread)
}
GLuint VertexBuffer::GetBuffer()
/////////////////////////////////////////////////////////////////////////////
SharedVertexBuffer::SharedVertexBuffer(VertexFormat format, int64_t size) : Format(format), Size(size)
{
}
GLuint SharedVertexBuffer::GetBuffer()
{
if (mBuffer == 0)
glGenBuffers(1, &mBuffer);
return mBuffer;
}
GLuint VertexBuffer::GetVAO()
GLuint SharedVertexBuffer::GetVAO()
{
if (!mVAO)
{
@ -35,7 +41,7 @@ GLuint VertexBuffer::GetVAO()
return mVAO;
}
void VertexBuffer::SetupFlatVAO()
void SharedVertexBuffer::SetupFlatVAO()
{
glEnableVertexAttribArray((int)DeclarationUsage::Position);
glEnableVertexAttribArray((int)DeclarationUsage::Color);
@ -45,7 +51,7 @@ void VertexBuffer::SetupFlatVAO()
glVertexAttribPointer((int)DeclarationUsage::TextureCoordinate, 2, GL_FLOAT, GL_FALSE, FlatStride, (const void*)16);
}
void VertexBuffer::SetupWorldVAO()
void SharedVertexBuffer::SetupWorldVAO()
{
glEnableVertexAttribArray((int)DeclarationUsage::Position);
glEnableVertexAttribArray((int)DeclarationUsage::Color);

20
Source/Native/VertexBuffer.h
View file

@ -2,17 +2,19 @@
enum class VertexFormat : int32_t { Flat, World };
class VertexBuffer
class SharedVertexBuffer
{
public:
VertexBuffer();
~VertexBuffer();
SharedVertexBuffer(VertexFormat format, int64_t size);
GLuint GetBuffer();
GLuint GetVAO();
VertexFormat Format = VertexFormat::Flat;
int64_t NextPos = 0;
int64_t Size = 0;
static const int FlatStride = 24;
static const int WorldStride = 36;
@ -23,3 +25,15 @@ private:
GLuint mBuffer = 0;
GLuint mVAO = 0;
};
class VertexBuffer
{
public:
VertexBuffer();
~VertexBuffer();
VertexFormat Format = VertexFormat::Flat;
int BufferOffset = 0;
int BufferStartIndex = 0;
};