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

Add an optimisation to the OpenGL renderers

Browse source 
Since we track the currently-bound "source texture", we don't need
to poll the OpenGL driver for the same info.
This commit is contained in:
Clownacy 2020-02-03 15:53:59 +00:00
parent dfacd62662
commit 53c0e8470f
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -479,9 +479,6 @@ static SPRITEBATCH_U64 GlyphBatch_CreateTexture(void *pixels, int w, int h, void
{ {
(void)udata; (void)udata;
GLint previously_bound_texture;
glGetIntegerv(GL_TEXTURE_BINDING_2D, &previously_bound_texture);
GLuint texture_id; GLuint texture_id;
glGenTextures(1, &texture_id); glGenTextures(1, &texture_id);
glBindTexture(GL_TEXTURE_2D, texture_id); glBindTexture(GL_TEXTURE_2D, texture_id);
@ -499,7 +496,7 @@ static SPRITEBATCH_U64 GlyphBatch_CreateTexture(void *pixels, int w, int h, void
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
#endif #endif
glBindTexture(GL_TEXTURE_2D, previously_bound_texture); glBindTexture(GL_TEXTURE_2D, last_source_texture);
return (SPRITEBATCH_U64)texture_id; return (SPRITEBATCH_U64)texture_id;
} }
@ -796,9 +793,6 @@ Backend_Surface* Backend_CreateSurface(unsigned int width, unsigned int height)
if (surface == NULL) if (surface == NULL)
return NULL; return NULL;
GLint previously_bound_texture;
glGetIntegerv(GL_TEXTURE_BINDING_2D, &previously_bound_texture);
glGenTextures(1, &surface->texture_id); glGenTextures(1, &surface->texture_id);
glBindTexture(GL_TEXTURE_2D, surface->texture_id); glBindTexture(GL_TEXTURE_2D, surface->texture_id);
#ifdef USE_OPENGLES2 #ifdef USE_OPENGLES2
@ -814,7 +808,7 @@ Backend_Surface* Backend_CreateSurface(unsigned int width, unsigned int height)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
#endif #endif
glBindTexture(GL_TEXTURE_2D, previously_bound_texture); glBindTexture(GL_TEXTURE_2D, last_source_texture);
surface->width = width; surface->width = width;
surface->height = height; surface->height = height;
@ -866,14 +860,11 @@ void Backend_UnlockSurface(Backend_Surface *surface, unsigned int width, unsigne
if (surface->texture_id == last_source_texture || surface->texture_id == last_destination_texture) if (surface->texture_id == last_source_texture || surface->texture_id == last_destination_texture)
FlushVertexBuffer(); FlushVertexBuffer();
GLint previously_bound_texture;
glGetIntegerv(GL_TEXTURE_BINDING_2D, &previously_bound_texture);
glBindTexture(GL_TEXTURE_2D, surface->texture_id); glBindTexture(GL_TEXTURE_2D, surface->texture_id);
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, surface->pixels); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, surface->pixels);
free(surface->pixels); free(surface->pixels);
glBindTexture(GL_TEXTURE_2D, previously_bound_texture); glBindTexture(GL_TEXTURE_2D, last_source_texture);
} }
// ==================== // ====================