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

Flexible OpenGL unpack alignment

Browse source
This commit is contained in:
Clownacy 2020-09-17 18:05:38 +01:00
parent 86d084f750
commit b8ceefcefd
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -294,6 +294,13 @@ static void GLAPIENTRY MessageCallback(GLenum source, GLenum type, GLuint id, GL
} }
*/ */
static void SetTextureUploadAlignment(size_t pitch)
{
const GLint alignments[8] = {8, 1, 2, 1, 4, 1, 2, 1};
glPixelStorei(GL_UNPACK_ALIGNMENT, alignments[pitch & 7]);
}
//////////////////////// ////////////////////////
// Shader compilation // // Shader compilation //
//////////////////////// ////////////////////////
@ -709,6 +716,7 @@ void RenderBackend_UploadSurface(RenderBackend_Surface *surface, const unsigned
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();
SetTextureUploadAlignment(width * 3);
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, pixels); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, pixels);
glBindTexture(GL_TEXTURE_2D, last_source_texture); glBindTexture(GL_TEXTURE_2D, last_source_texture);
@ -932,7 +940,7 @@ void RenderBackend_UploadGlyph(RenderBackend_GlyphAtlas *atlas, size_t x, size_t
for (size_t y = 0; y < height; ++y) for (size_t y = 0; y < height; ++y)
memcpy (&buffer[y * width], &pixels[y * pitch], width); memcpy (&buffer[y * width], &pixels[y * pitch], width);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); SetTextureUploadAlignment(width);
glBindTexture(GL_TEXTURE_2D, atlas->texture_id); glBindTexture(GL_TEXTURE_2D, atlas->texture_id);
#ifdef USE_OPENGLES2 #ifdef USE_OPENGLES2
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, GL_LUMINANCE, GL_UNSIGNED_BYTE, buffer); glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, GL_LUMINANCE, GL_UNSIGNED_BYTE, buffer);