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

Fix Wii U using an uninitialised vertex buffer

Browse source
This commit is contained in:
Clownacy 2020-10-03 18:35:40 +01:00
parent c7cd67c410
commit 6803438358
1 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,7 +125,7 @@ static VertexBufferSlot* GetVertexBufferSlot(void)
static void FlushVertexBuffer(void) static void FlushVertexBuffer(void)
{ {
static size_t vertex_buffer_size; static size_t vertex_buffer_size = 1;
static size_t current_vertex_buffer = 0; static size_t current_vertex_buffer = 0;
if (current_vertex_buffer_slot == 0) if (current_vertex_buffer_slot == 0)
@ -141,11 +141,6 @@ static void FlushVertexBuffer(void)
GX2RDestroyBufferEx(&vertex_buffer, (GX2RResourceFlags)0); 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; vertex_buffer.elemCount = vertex_buffer_size;
if (GX2RCreateBuffer(&vertex_buffer)) if (GX2RCreateBuffer(&vertex_buffer))
@ -210,37 +205,52 @@ RenderBackend_Surface* RenderBackend_Init(const char *window_title, size_t scree
// Initialise sampler // Initialise sampler
GX2InitSampler(&sampler, GX2_TEX_CLAMP_MODE_CLAMP, GX2_TEX_XY_FILTER_MODE_LINEAR); GX2InitSampler(&sampler, GX2_TEX_CLAMP_MODE_CLAMP, GX2_TEX_XY_FILTER_MODE_LINEAR);
// Create framebuffer surface // Initialise vertex buffer
framebuffer_surface = RenderBackend_CreateSurface(screen_width, screen_height, true); 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 = 1;
if (framebuffer_surface != NULL) if (GX2RCreateBuffer(&vertex_buffer))
{ {
// From what I can tell, there isn't a 'global context' in GX2: instead there are context objects. // Create framebuffer surface
// wut internally uses (and *switches to*) its own contexts, so we need to maintain one too, framebuffer_surface = RenderBackend_CreateSurface(screen_width, screen_height, true);
// and make sure we're always switching back to it when wut is done doing what it's doing.
gx2_context = (GX2ContextState*)aligned_alloc(GX2_CONTEXT_STATE_ALIGNMENT, sizeof(GX2ContextState));
if (gx2_context != NULL) if (framebuffer_surface != NULL)
{ {
memset(gx2_context, 0, sizeof(GX2ContextState)); // From what I can tell, there isn't a 'global context' in GX2: instead there are context objects.
GX2SetupContextStateEx(gx2_context, TRUE); // wut internally uses (and *switches to*) its own contexts, so we need to maintain one too,
GX2SetContextState(gx2_context); // and make sure we're always switching back to it when wut is done doing what it's doing.
gx2_context = (GX2ContextState*)aligned_alloc(GX2_CONTEXT_STATE_ALIGNMENT, sizeof(GX2ContextState));
// Disable depth-test (enabled by default for some reason) if (gx2_context != NULL)
GX2SetDepthOnlyControl(FALSE, FALSE, GX2_COMPARE_FUNC_ALWAYS); {
memset(gx2_context, 0, sizeof(GX2ContextState));
GX2SetupContextStateEx(gx2_context, TRUE);
GX2SetContextState(gx2_context);
return framebuffer_surface; // Disable depth-test (enabled by default for some reason)
GX2SetDepthOnlyControl(FALSE, FALSE, GX2_COMPARE_FUNC_ALWAYS);
return framebuffer_surface;
}
else
{
Backend_PrintError("Couldn't allocate memory for the GX2 context");
}
RenderBackend_FreeSurface(framebuffer_surface);
} }
else else
{ {
Backend_PrintError("Couldn't allocate memory for the GX2 context"); Backend_PrintError("Couldn't create the framebuffer surface");
} }
RenderBackend_FreeSurface(framebuffer_surface);
} }
else else
{ {
Backend_PrintError("Couldn't create the framebuffer surface"); Backend_PrintError("Couldn't create the vertex buffer");
} }
WHBGfxFreeShaderGroup(&shader_group_glyph); WHBGfxFreeShaderGroup(&shader_group_glyph);