duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make GetVertexBufferSlot consistent

Browse source 
It would be nice keep this batching stuff in a common file
somewhere...
This commit is contained in:
Clownacy 2020-09-15 16:28:35 +01:00
parent e2b64df84a
commit 392d5898a3
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Backends/Rendering/OpenGL3.cpp
View file

@ -347,21 +347,23 @@ static GLuint CompileShader(const char *vertex_shader_source, const char *fragme
// Vertex buffer management // // Vertex buffer management //
////////////////////////////// //////////////////////////////
static VertexBufferSlot* GetVertexBufferSlot(unsigned int slots_needed) static VertexBufferSlot* GetVertexBufferSlot(void)
{ {
++current_vertex_buffer_slot;
// Check if buffer needs expanding // Check if buffer needs expanding
if (current_vertex_buffer_slot + slots_needed > local_vertex_buffer_size) if (current_vertex_buffer_slot > local_vertex_buffer_size)
{ {
local_vertex_buffer_size = 1; local_vertex_buffer_size = 1;
while (current_vertex_buffer_slot + slots_needed > local_vertex_buffer_size) while (current_vertex_buffer_slot > local_vertex_buffer_size)
local_vertex_buffer_size <<= 1; local_vertex_buffer_size <<= 1;
VertexBufferSlot *realloc_result = (VertexBufferSlot*)realloc(local_vertex_buffer, local_vertex_buffer_size * sizeof(VertexBufferSlot)); VertexBufferSlot *new_vertex_buffer = (VertexBufferSlot*)realloc(local_vertex_buffer, local_vertex_buffer_size * sizeof(VertexBufferSlot));
if (realloc_result != NULL) if (new_vertex_buffer != NULL)
{ {
local_vertex_buffer = realloc_result; local_vertex_buffer = new_vertex_buffer;
} }
else else
{ {
@ -370,9 +372,7 @@ static VertexBufferSlot* GetVertexBufferSlot(unsigned int slots_needed)
} }
} }
current_vertex_buffer_slot += slots_needed; return &local_vertex_buffer[current_vertex_buffer_slot - 1];
return &local_vertex_buffer[current_vertex_buffer_slot - slots_needed];
} }
static void FlushVertexBuffer(void) static void FlushVertexBuffer(void)
@ -646,7 +646,7 @@ void RenderBackend_DrawScreen(void)
// Draw framebuffer to screen // Draw framebuffer to screen
glBindTexture(GL_TEXTURE_2D, framebuffer.texture_id); glBindTexture(GL_TEXTURE_2D, framebuffer.texture_id);
VertexBufferSlot *vertex_buffer_slot = GetVertexBufferSlot(1); VertexBufferSlot *vertex_buffer_slot = GetVertexBufferSlot();
if (vertex_buffer_slot != NULL) if (vertex_buffer_slot != NULL)
{ {
@ -812,7 +812,7 @@ void RenderBackend_Blit(RenderBackend_Surface *source_surface, const RenderBacke
} }
// Add data to the vertex queue // Add data to the vertex queue
VertexBufferSlot *vertex_buffer_slot = GetVertexBufferSlot(1); VertexBufferSlot *vertex_buffer_slot = GetVertexBufferSlot();
if (vertex_buffer_slot != NULL) if (vertex_buffer_slot != NULL)
{ {
@ -897,7 +897,7 @@ void RenderBackend_ColourFill(RenderBackend_Surface *surface, const RenderBacken
} }
// Add data to the vertex queue // Add data to the vertex queue
VertexBufferSlot *vertex_buffer_slot = GetVertexBufferSlot(1); VertexBufferSlot *vertex_buffer_slot = GetVertexBufferSlot();
if (vertex_buffer_slot != NULL) if (vertex_buffer_slot != NULL)
{ {
@ -1027,7 +1027,7 @@ void RenderBackend_PrepareToDrawGlyphs(RenderBackend_GlyphAtlas *atlas, RenderBa
void RenderBackend_DrawGlyph(RenderBackend_GlyphAtlas *atlas, long x, long y, size_t glyph_x, size_t glyph_y, size_t glyph_width, size_t glyph_height) void RenderBackend_DrawGlyph(RenderBackend_GlyphAtlas *atlas, long x, long y, size_t glyph_x, size_t glyph_y, size_t glyph_width, size_t glyph_height)
{ {
// Add data to the vertex queue // Add data to the vertex queue
VertexBufferSlot *vertex_buffer_slot = GetVertexBufferSlot(1); VertexBufferSlot *vertex_buffer_slot = GetVertexBufferSlot();
if (vertex_buffer_slot != NULL) if (vertex_buffer_slot != NULL)
{ {

6
src/Backends/Rendering/WiiU.cpp
View file

@ -111,11 +111,11 @@ static VertexBufferSlot* GetVertexBufferSlot(void)
while (current_vertex_buffer_slot > local_vertex_buffer_size) while (current_vertex_buffer_slot > local_vertex_buffer_size)
local_vertex_buffer_size <<= 1; local_vertex_buffer_size <<= 1;
VertexBufferSlot *realloc_result = (VertexBufferSlot*)realloc(local_vertex_buffer, local_vertex_buffer_size * sizeof(VertexBufferSlot)); VertexBufferSlot *new_vertex_buffer = (VertexBufferSlot*)realloc(local_vertex_buffer, local_vertex_buffer_size * sizeof(VertexBufferSlot));
if (realloc_result != NULL) if (new_vertex_buffer != NULL)
{ {
local_vertex_buffer = realloc_result; local_vertex_buffer = new_vertex_buffer;
} }
else else
{ {