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

Backport OpenGL2 fixes from the enhanced branch

Browse source
This commit is contained in:
Clownacy 2019-07-24 20:00:23 +01:00
parent b2244f17fc
commit 7bbc0321cd
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Backends/Rendering/OpenGL2.cpp
View file

@ -113,6 +113,7 @@ BOOL Backend_Init(SDL_Window *p_window)
// Set up framebuffer (used for surface-to-surface blitting) // Set up framebuffer (used for surface-to-surface blitting)
glGenFramebuffersEXT(1, &framebuffer_id); glGenFramebuffersEXT(1, &framebuffer_id);
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer_id);
// Set up framebuffer screen texture (used for screen-to-surface blitting) // Set up framebuffer screen texture (used for screen-to-surface blitting)
glGenTextures(1, &framebuffer_surface.texture_id); glGenTextures(1, &framebuffer_surface.texture_id);
@ -214,6 +215,9 @@ void Backend_Unlock(Backend_Surface *surface)
static void BlitCommon(Backend_Surface *source_surface, const RECT *rect, long x, long y, BOOL colour_key) static void BlitCommon(Backend_Surface *source_surface, const RECT *rect, long x, long y, BOOL colour_key)
{ {
if (rect->right - rect->left < 0 || rect->bottom - rect->top < 0)
return;
// Switch to colour-key shader if we have to // Switch to colour-key shader if we have to
glUseProgram(colour_key ? colour_key_program_id : 0); glUseProgram(colour_key ? colour_key_program_id : 0);
@ -250,6 +254,9 @@ void Backend_BlitToScreen(Backend_Surface *source_surface, const RECT *rect, lon
static void ColourFillCommon(const RECT *rect, unsigned char red, unsigned char green, unsigned char blue) static void ColourFillCommon(const RECT *rect, unsigned char red, unsigned char green, unsigned char blue)
{ {
if (rect->right - rect->left < 0 || rect->bottom - rect->top < 0)
return;
// Disable colour-keying // Disable colour-keying
glUseProgram(0); glUseProgram(0);
@ -303,6 +310,12 @@ Backend_Glyph* Backend_LoadGlyph(const unsigned char *pixels, unsigned int width
unsigned char *buffer = (unsigned char*)malloc(width * height * 4); unsigned char *buffer = (unsigned char*)malloc(width * height * 4);
if (buffer == NULL)
{
free(glyph);
return NULL;
}
switch (pixel_mode) switch (pixel_mode)
{ {
// FONT_PIXEL_MODE_LCD is unsupported // FONT_PIXEL_MODE_LCD is unsupported