mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Fix OpenGL renderer stuttering when loading new textures into atlas

Browse Source
This commit is contained in:
ζeh Matt
2018-09-07 10:21:28 +02:00
committed by Michael Steenbeek
parent a1fd033822
commit 65659e2ab6
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp
View File

@@ -136,6 +136,7 @@ void TextureCache::CreateTextures()
_initialized = true;
_atlasesTextureIndices = 0;
_atlasesTextureCapacity = 0;
}
}
@@ -169,22 +170,33 @@ void TextureCache::EnlargeAtlasesTexture(GLuint newEntries)
GLuint newIndices = _atlasesTextureIndices + newEntries;
// Retrieve current array data
auto oldPixels = std::vector<char>(_atlasesTextureDimensions * _atlasesTextureDimensions * _atlasesTextureIndices);
if (oldPixels.size() > 0)
std::vector<char> oldPixels;
if (newIndices > _atlasesTextureCapacity)
{
glGetTexImage(GL_TEXTURE_2D_ARRAY, 0, GL_RED_INTEGER, GL_UNSIGNED_BYTE, oldPixels.data());
// Retrieve current array data, growing buffer.
oldPixels.resize(_atlasesTextureDimensions * _atlasesTextureDimensions * _atlasesTextureCapacity);
if (oldPixels.size() > 0)
{
glGetTexImage(GL_TEXTURE_2D_ARRAY, 0, GL_RED_INTEGER, GL_UNSIGNED_BYTE, oldPixels.data());
}
// Initial capacity will be 12 which covers most cases of a fully visible park.
_atlasesTextureCapacity = (_atlasesTextureCapacity + 6) << 1;
}
glBindTexture(GL_TEXTURE_2D_ARRAY, _atlasesTexture);
glTexImage3D(
GL_TEXTURE_2D_ARRAY, 0, GL_R8UI, _atlasesTextureDimensions, _atlasesTextureDimensions, newIndices, 0, GL_RED_INTEGER,
GL_UNSIGNED_BYTE, nullptr);
GL_TEXTURE_2D_ARRAY, 0, GL_R8UI, _atlasesTextureDimensions, _atlasesTextureDimensions, _atlasesTextureCapacity, 0,
GL_RED_INTEGER, GL_UNSIGNED_BYTE, nullptr);
// Restore old data
glTexSubImage3D(
GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, _atlasesTextureDimensions, _atlasesTextureDimensions, _atlasesTextureIndices,
GL_RED_INTEGER, GL_UNSIGNED_BYTE, oldPixels.data());
if (oldPixels.size() > 0)
{
glTexSubImage3D(
GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, _atlasesTextureDimensions, _atlasesTextureDimensions, _atlasesTextureIndices,
GL_RED_INTEGER, GL_UNSIGNED_BYTE, oldPixels.data());
}
_atlasesTextureIndices = newIndices;
}

1
src/openrct2-ui/drawing/engines/opengl/TextureCache.h
View File

@@ -189,6 +189,7 @@ private:
GLuint _atlasesTexture = 0;
GLint _atlasesTextureDimensions = 0;
GLuint _atlasesTextureCapacity = 0;
GLuint _atlasesTextureIndices = 0;
GLint _atlasesTextureIndicesLimit = 0;
std::vector<Atlas> _atlases;