Add vertex-batching to Wii U port
Should remove the last bit of lag that port has (like the Labyrinth fight where you team-up with Curly)
This commit is contained in:
Clownacy
parent
9925c16b29
commit
f6fe0537ed
1 changed files with 260 additions and 150 deletions
|
|
@ -25,6 +25,15 @@
|
|||
#include "WiiUShaders/texture.gsh.h"
|
||||
#include "WiiUShaders/texture_colour_key.gsh.h"
|
||||
|
||||
typedef enum RenderMode
|
||||
{
|
||||
MODE_BLANK,
|
||||
MODE_DRAW_SURFACE,
|
||||
MODE_DRAW_SURFACE_WITH_TRANSPARENCY,
|
||||
MODE_COLOUR_FILL,
|
||||
MODE_DRAW_GLYPH
|
||||
} RenderMode;
|
||||
|
||||
typedef struct RenderBackend_Surface
|
||||
{
|
||||
GX2Texture texture;
|
||||
|
|
@ -62,6 +71,11 @@ typedef struct Vertex
|
|||
Coordinate2D texture;
|
||||
} Vertex;
|
||||
|
||||
typedef struct VertexBufferSlot
|
||||
{
|
||||
Vertex vertices[4];
|
||||
} VertexBufferSlot;
|
||||
|
||||
static WHBGfxShaderGroup texture_shader;
|
||||
static WHBGfxShaderGroup texture_colour_key_shader;
|
||||
static WHBGfxShaderGroup colour_fill_shader;
|
||||
|
|
@ -80,6 +94,90 @@ static RenderBackend_Surface *glyph_destination_surface;
|
|||
static Viewport tv_viewport;
|
||||
static Viewport drc_viewport;
|
||||
|
||||
static VertexBufferSlot *local_vertex_buffer;
|
||||
static unsigned long local_vertex_buffer_size;
|
||||
static unsigned long current_vertex_buffer_slot;
|
||||
|
||||
static RenderMode last_render_mode;
|
||||
static RenderBackend_Surface *last_source_surface;
|
||||
static RenderBackend_Surface *last_destination_surface;
|
||||
|
||||
static VertexBufferSlot* GetVertexBufferSlot(unsigned int slots_needed)
|
||||
{
|
||||
// Check if buffer needs expanding
|
||||
if (current_vertex_buffer_slot + slots_needed > local_vertex_buffer_size)
|
||||
{
|
||||
local_vertex_buffer_size = 1;
|
||||
|
||||
while (current_vertex_buffer_slot + slots_needed > local_vertex_buffer_size)
|
||||
local_vertex_buffer_size <<= 1;
|
||||
|
||||
VertexBufferSlot *realloc_result = (VertexBufferSlot*)realloc(local_vertex_buffer, local_vertex_buffer_size * sizeof(VertexBufferSlot));
|
||||
|
||||
if (realloc_result != NULL)
|
||||
{
|
||||
local_vertex_buffer = realloc_result;
|
||||
}
|
||||
else
|
||||
{
|
||||
Backend_PrintError("Couldn't expand vertex buffer");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
current_vertex_buffer_slot += slots_needed;
|
||||
|
||||
return &local_vertex_buffer[current_vertex_buffer_slot - slots_needed];
|
||||
}
|
||||
|
||||
static void FlushVertexBuffer(void)
|
||||
{
|
||||
static unsigned long vertex_buffer_size;
|
||||
static unsigned int current_vertex_buffer = 0;
|
||||
|
||||
if (current_vertex_buffer_slot == 0)
|
||||
return;
|
||||
|
||||
// Make sure the buffers aren't currently being used before we modify them
|
||||
GX2DrawDone();
|
||||
|
||||
// Upload vertex buffer to VBO, growing it if necessary
|
||||
if (local_vertex_buffer_size > vertex_buffer_size)
|
||||
{
|
||||
vertex_buffer_size = local_vertex_buffer_size;
|
||||
|
||||
GX2RDestroyBufferEx(&vertex_buffer, (GX2RResourceFlags)0);
|
||||
|
||||
vertex_buffer.flags = (GX2RResourceFlags)(GX2R_RESOURCE_BIND_VERTEX_BUFFER |
|
||||
GX2R_RESOURCE_USAGE_CPU_READ |
|
||||
GX2R_RESOURCE_USAGE_CPU_WRITE |
|
||||
GX2R_RESOURCE_USAGE_GPU_READ);
|
||||
vertex_buffer.elemSize = sizeof(VertexBufferSlot);
|
||||
vertex_buffer.elemCount = vertex_buffer_size;
|
||||
|
||||
if (GX2RCreateBuffer(&vertex_buffer))
|
||||
{
|
||||
void *vertex_pointer = GX2RLockBufferEx(&vertex_buffer, (GX2RResourceFlags)0);
|
||||
|
||||
memcpy(vertex_pointer, local_vertex_buffer, vertex_buffer_size * sizeof(VertexBufferSlot));
|
||||
|
||||
GX2RUnlockBufferEx(&vertex_buffer, (GX2RResourceFlags)0);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
void *vertex_pointer = GX2RLockBufferEx(&vertex_buffer, (GX2RResourceFlags)0);
|
||||
|
||||
memcpy(vertex_pointer, local_vertex_buffer, current_vertex_buffer_slot * sizeof(VertexBufferSlot));
|
||||
|
||||
GX2RUnlockBufferEx(&vertex_buffer, (GX2RResourceFlags)0);
|
||||
}
|
||||
|
||||
GX2DrawEx(GX2_PRIMITIVE_MODE_QUADS, 4 * current_vertex_buffer_slot, 0, 1);
|
||||
|
||||
current_vertex_buffer_slot = 0;
|
||||
}
|
||||
|
||||
static void CalculateViewport(unsigned int actual_screen_width, unsigned int actual_screen_height, Viewport *viewport)
|
||||
{
|
||||
if ((float)actual_screen_width / (float)actual_screen_height > (float)framebuffer_surface->width / (float)framebuffer_surface->height)
|
||||
|
|
@ -136,16 +234,6 @@ RenderBackend_Surface* RenderBackend_Init(const char *window_title, int screen_w
|
|||
WHBGfxInitShaderAttribute(&glyph_shader, "input_texture_coordinates", 1, 0, GX2_ATTRIB_FORMAT_FLOAT_32_32);
|
||||
WHBGfxInitFetchShader(&glyph_shader);
|
||||
|
||||
// Initialise vertex position buffer
|
||||
vertex_buffer.flags = (GX2RResourceFlags)(GX2R_RESOURCE_BIND_VERTEX_BUFFER |
|
||||
GX2R_RESOURCE_USAGE_CPU_READ |
|
||||
GX2R_RESOURCE_USAGE_CPU_WRITE |
|
||||
GX2R_RESOURCE_USAGE_GPU_READ);
|
||||
vertex_buffer.elemSize = sizeof(Vertex);
|
||||
vertex_buffer.elemCount = 4;
|
||||
|
||||
if (GX2RCreateBuffer(&vertex_buffer))
|
||||
{
|
||||
// Initialise sampler
|
||||
GX2InitSampler(&sampler, GX2_TEX_CLAMP_MODE_CLAMP, GX2_TEX_XY_FILTER_MODE_LINEAR);
|
||||
|
||||
|
|
@ -205,13 +293,6 @@ RenderBackend_Surface* RenderBackend_Init(const char *window_title, int screen_w
|
|||
Backend_PrintError("Couldn't create the framebuffer surface");
|
||||
}
|
||||
|
||||
GX2RDestroyBufferEx(&vertex_buffer, (GX2RResourceFlags)0);
|
||||
}
|
||||
else
|
||||
{
|
||||
Backend_PrintError("Couldn't create the vertex buffer");
|
||||
}
|
||||
|
||||
WHBGfxFreeShaderGroup(&glyph_shader);
|
||||
}
|
||||
else
|
||||
|
|
@ -268,6 +349,11 @@ void RenderBackend_Deinit(void)
|
|||
|
||||
void RenderBackend_DrawScreen(void)
|
||||
{
|
||||
FlushVertexBuffer();
|
||||
last_render_mode = MODE_BLANK;
|
||||
last_source_surface = NULL;
|
||||
last_destination_surface = NULL;
|
||||
|
||||
// Make sure the buffers aren't currently being used before we modify them
|
||||
GX2DrawDone();
|
||||
|
||||
|
|
@ -503,48 +589,16 @@ void RenderBackend_Blit(RenderBackend_Surface *source_surface, const RenderBacke
|
|||
if (source_surface == NULL || destination_surface == NULL)
|
||||
return;
|
||||
|
||||
// Make sure the buffers aren't currently being used before we modify them
|
||||
GX2DrawDone();
|
||||
const RenderMode render_mode = (colour_key ? MODE_DRAW_SURFACE_WITH_TRANSPARENCY : MODE_DRAW_SURFACE);
|
||||
|
||||
Vertex *vertex_pointer = (Vertex*)GX2RLockBufferEx(&vertex_buffer, (GX2RResourceFlags)0);
|
||||
|
||||
// Set vertex position buffer
|
||||
const float destination_left = x;
|
||||
const float destination_top = y;
|
||||
const float destination_right = x + (rect->right - rect->left);
|
||||
const float destination_bottom = y + (rect->bottom - rect->top);
|
||||
|
||||
vertex_pointer[0].position.x = destination_left;
|
||||
vertex_pointer[0].position.y = destination_top;
|
||||
vertex_pointer[1].position.x = destination_right;
|
||||
vertex_pointer[1].position.y = destination_top;
|
||||
vertex_pointer[2].position.x = destination_right;
|
||||
vertex_pointer[2].position.y = destination_bottom;
|
||||
vertex_pointer[3].position.x = destination_left;
|
||||
vertex_pointer[3].position.y = destination_bottom;
|
||||
|
||||
for (unsigned int i = 0; i < 4; ++i)
|
||||
// Flush vertex data if a context-change is needed
|
||||
if (last_render_mode != render_mode || last_source_surface != source_surface || last_destination_surface != destination_surface)
|
||||
{
|
||||
vertex_pointer[i].position.x /= destination_surface->width;
|
||||
vertex_pointer[i].position.x *= 2.0f;
|
||||
vertex_pointer[i].position.x -= 1.0f;
|
||||
FlushVertexBuffer();
|
||||
|
||||
vertex_pointer[i].position.y /= destination_surface->height;
|
||||
vertex_pointer[i].position.y *= -2.0f;
|
||||
vertex_pointer[i].position.y += 1.0f;
|
||||
}
|
||||
|
||||
// Set texture coordinate buffer
|
||||
vertex_pointer[0].texture.x = rect->left / (float)source_surface->width;
|
||||
vertex_pointer[0].texture.y = rect->top / (float)source_surface->height;
|
||||
vertex_pointer[1].texture.x = rect->right / (float)source_surface->width;
|
||||
vertex_pointer[1].texture.y = rect->top / (float)source_surface->height;
|
||||
vertex_pointer[2].texture.x = rect->right / (float)source_surface->width;
|
||||
vertex_pointer[2].texture.y = rect->bottom / (float)source_surface->height;
|
||||
vertex_pointer[3].texture.x = rect->left / (float)source_surface->width;
|
||||
vertex_pointer[3].texture.y = rect->bottom / (float)source_surface->height;
|
||||
|
||||
GX2RUnlockBufferEx(&vertex_buffer, (GX2RResourceFlags)0);
|
||||
last_render_mode = render_mode;
|
||||
last_source_surface = source_surface;
|
||||
last_destination_surface = destination_surface;
|
||||
|
||||
// Draw to the selected texture, instead of the screen
|
||||
GX2SetColorBuffer(&destination_surface->colour_buffer, GX2_RENDER_TARGET_0);
|
||||
|
|
@ -564,43 +618,70 @@ void RenderBackend_Blit(RenderBackend_Surface *source_surface, const RenderBacke
|
|||
GX2SetPixelTexture(&source_surface->texture, shader->pixelShader->samplerVars[0].location);
|
||||
GX2RSetAttributeBuffer(&vertex_buffer, 0, sizeof(Vertex), offsetof(Vertex, position));
|
||||
GX2RSetAttributeBuffer(&vertex_buffer, 1, sizeof(Vertex), offsetof(Vertex, texture));
|
||||
}
|
||||
|
||||
// Draw
|
||||
GX2DrawEx(GX2_PRIMITIVE_MODE_QUADS, 4, 0, 1);
|
||||
VertexBufferSlot *vertex_buffer_slot = GetVertexBufferSlot(1);
|
||||
|
||||
if (vertex_buffer_slot != NULL)
|
||||
{
|
||||
// Set vertex position buffer
|
||||
const float destination_left = x;
|
||||
const float destination_top = y;
|
||||
const float destination_right = x + (rect->right - rect->left);
|
||||
const float destination_bottom = y + (rect->bottom - rect->top);
|
||||
|
||||
vertex_buffer_slot->vertices[0].position.x = destination_left;
|
||||
vertex_buffer_slot->vertices[0].position.y = destination_top;
|
||||
vertex_buffer_slot->vertices[1].position.x = destination_right;
|
||||
vertex_buffer_slot->vertices[1].position.y = destination_top;
|
||||
vertex_buffer_slot->vertices[2].position.x = destination_right;
|
||||
vertex_buffer_slot->vertices[2].position.y = destination_bottom;
|
||||
vertex_buffer_slot->vertices[3].position.x = destination_left;
|
||||
vertex_buffer_slot->vertices[3].position.y = destination_bottom;
|
||||
|
||||
for (unsigned int i = 0; i < 4; ++i)
|
||||
{
|
||||
vertex_buffer_slot->vertices[i].position.x /= destination_surface->width;
|
||||
vertex_buffer_slot->vertices[i].position.x *= 2.0f;
|
||||
vertex_buffer_slot->vertices[i].position.x -= 1.0f;
|
||||
|
||||
vertex_buffer_slot->vertices[i].position.y /= destination_surface->height;
|
||||
vertex_buffer_slot->vertices[i].position.y *= -2.0f;
|
||||
vertex_buffer_slot->vertices[i].position.y += 1.0f;
|
||||
}
|
||||
|
||||
// Set texture coordinate buffer
|
||||
vertex_buffer_slot->vertices[0].texture.x = rect->left / (float)source_surface->width;
|
||||
vertex_buffer_slot->vertices[0].texture.y = rect->top / (float)source_surface->height;
|
||||
vertex_buffer_slot->vertices[1].texture.x = rect->right / (float)source_surface->width;
|
||||
vertex_buffer_slot->vertices[1].texture.y = rect->top / (float)source_surface->height;
|
||||
vertex_buffer_slot->vertices[2].texture.x = rect->right / (float)source_surface->width;
|
||||
vertex_buffer_slot->vertices[2].texture.y = rect->bottom / (float)source_surface->height;
|
||||
vertex_buffer_slot->vertices[3].texture.x = rect->left / (float)source_surface->width;
|
||||
vertex_buffer_slot->vertices[3].texture.y = rect->bottom / (float)source_surface->height;
|
||||
}
|
||||
}
|
||||
|
||||
void RenderBackend_ColourFill(RenderBackend_Surface *surface, const RenderBackend_Rect *rect, unsigned char red, unsigned char green, unsigned char blue)
|
||||
{
|
||||
static unsigned char last_red;
|
||||
static unsigned char last_green;
|
||||
static unsigned char last_blue;
|
||||
|
||||
if (surface == NULL)
|
||||
return;
|
||||
|
||||
// Make sure the buffers aren't currently being used before we modify them
|
||||
GX2DrawDone();
|
||||
|
||||
Vertex *vertex_pointer = (Vertex*)GX2RLockBufferEx(&vertex_buffer, (GX2RResourceFlags)0);
|
||||
|
||||
// Set vertex position buffer
|
||||
vertex_pointer[0].position.x = rect->left;
|
||||
vertex_pointer[0].position.y = rect->top;
|
||||
vertex_pointer[1].position.x = rect->right;
|
||||
vertex_pointer[1].position.y = rect->top;
|
||||
vertex_pointer[2].position.x = rect->right;
|
||||
vertex_pointer[2].position.y = rect->bottom;
|
||||
vertex_pointer[3].position.x = rect->left;
|
||||
vertex_pointer[3].position.y = rect->bottom;
|
||||
|
||||
for (unsigned int i = 0; i < 4; ++i)
|
||||
// Flush vertex data if a context-change is needed
|
||||
if (last_render_mode != MODE_COLOUR_FILL || last_destination_surface != surface || last_red != red || last_green != green || last_blue != blue)
|
||||
{
|
||||
vertex_pointer[i].position.x /= surface->width;
|
||||
vertex_pointer[i].position.x *= 2.0f;
|
||||
vertex_pointer[i].position.x -= 1.0f;
|
||||
FlushVertexBuffer();
|
||||
|
||||
vertex_pointer[i].position.y /= surface->height;
|
||||
vertex_pointer[i].position.y *= -2.0f;
|
||||
vertex_pointer[i].position.y += 1.0f;
|
||||
}
|
||||
|
||||
GX2RUnlockBufferEx(&vertex_buffer, (GX2RResourceFlags)0);
|
||||
last_render_mode = MODE_COLOUR_FILL;
|
||||
last_source_surface = NULL;
|
||||
last_destination_surface = surface;
|
||||
last_red = red;
|
||||
last_green = green;
|
||||
last_blue = blue;
|
||||
|
||||
// Draw to the selected texture, instead of the screen
|
||||
GX2SetColorBuffer(&surface->colour_buffer, GX2_RENDER_TARGET_0);
|
||||
|
|
@ -618,9 +699,33 @@ void RenderBackend_ColourFill(RenderBackend_Surface *surface, const RenderBacken
|
|||
|
||||
// Bind misc. data
|
||||
GX2RSetAttributeBuffer(&vertex_buffer, 0, sizeof(Vertex), offsetof(Vertex, position));
|
||||
}
|
||||
|
||||
// Draw
|
||||
GX2DrawEx(GX2_PRIMITIVE_MODE_QUADS, 4, 0, 1);
|
||||
VertexBufferSlot *vertex_buffer_slot = GetVertexBufferSlot(1);
|
||||
|
||||
if (vertex_buffer_slot != NULL)
|
||||
{
|
||||
// Set vertex position buffer
|
||||
vertex_buffer_slot->vertices[0].position.x = rect->left;
|
||||
vertex_buffer_slot->vertices[0].position.y = rect->top;
|
||||
vertex_buffer_slot->vertices[1].position.x = rect->right;
|
||||
vertex_buffer_slot->vertices[1].position.y = rect->top;
|
||||
vertex_buffer_slot->vertices[2].position.x = rect->right;
|
||||
vertex_buffer_slot->vertices[2].position.y = rect->bottom;
|
||||
vertex_buffer_slot->vertices[3].position.x = rect->left;
|
||||
vertex_buffer_slot->vertices[3].position.y = rect->bottom;
|
||||
|
||||
for (unsigned int i = 0; i < 4; ++i)
|
||||
{
|
||||
vertex_buffer_slot->vertices[i].position.x /= surface->width;
|
||||
vertex_buffer_slot->vertices[i].position.x *= 2.0f;
|
||||
vertex_buffer_slot->vertices[i].position.x -= 1.0f;
|
||||
|
||||
vertex_buffer_slot->vertices[i].position.y /= surface->height;
|
||||
vertex_buffer_slot->vertices[i].position.y *= -2.0f;
|
||||
vertex_buffer_slot->vertices[i].position.y += 1.0f;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RenderBackend_Glyph* RenderBackend_LoadGlyph(const unsigned char *pixels, unsigned int width, unsigned int height, int pitch)
|
||||
|
|
@ -692,6 +797,11 @@ void RenderBackend_UnloadGlyph(RenderBackend_Glyph *glyph)
|
|||
|
||||
void RenderBackend_PrepareToDrawGlyphs(RenderBackend_Surface *destination_surface, const unsigned char *colour_channels)
|
||||
{
|
||||
FlushVertexBuffer();
|
||||
last_render_mode = MODE_BLANK;
|
||||
last_source_surface = NULL;
|
||||
last_destination_surface = NULL;
|
||||
|
||||
if (destination_surface == NULL)
|
||||
return;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue