TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-22 11:31:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

OpenGL: Respect max supported texture size (#518)

Browse Source
This commit is contained in:
Anders Jenbo 2025-07-04 14:47:24 +02:00 committed by GitHub
parent 5e62e7e39f
commit 4983da422c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
miniwin/src/d3drm/backends/opengl1/actual.cpp
View File

@ -42,6 +42,13 @@ void GL11_DestroyTexture(GLuint texId)
glDeleteTextures(1, &texId); glDeleteTextures(1, &texId);
} }
int GL11_GetMaxTextureSize()
{
GLint maxTextureSize = 0;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
return maxTextureSize;
}
GLuint GL11_UploadTextureData(void* pixels, int width, int height, bool isUi) GLuint GL11_UploadTextureData(void* pixels, int width, int height, bool isUi)
{ {
GLuint texId; GLuint texId;

1
miniwin/src/d3drm/backends/opengl1/actual.h
View File

@ -64,6 +64,7 @@ struct GLMeshCacheEntry {
void GL11_InitState(); void GL11_InitState();
void GL11_LoadExtensions(); void GL11_LoadExtensions();
void GL11_DestroyTexture(GLuint texId); void GL11_DestroyTexture(GLuint texId);
int GL11_GetMaxTextureSize();
GLuint GL11_UploadTextureData(void* pixels, int width, int height, bool isUI); GLuint GL11_UploadTextureData(void* pixels, int width, int height, bool isUI);
void GL11_UploadMesh(GLMeshCacheEntry& cache, bool hasTexture); void GL11_UploadMesh(GLMeshCacheEntry& cache, bool hasTexture);
void GL11_DestroyMesh(GLMeshCacheEntry& cache); void GL11_DestroyMesh(GLMeshCacheEntry& cache);

17
miniwin/src/d3drm/backends/opengl1/renderer.cpp
View File

@ -132,10 +132,21 @@ static Uint32 UploadTextureData(SDL_Surface* src, bool useNPOT, bool isUi)
SDL_Surface* finalSurface = working; SDL_Surface* finalSurface = working;
int newW = NextPowerOfTwo(working->w); int newW = working->w;
int newH = NextPowerOfTwo(working->h); int newH = working->h;
if (!useNPOT) {
newW = NextPowerOfTwo(newW);
newH = NextPowerOfTwo(newH);
}
int max = GL11_GetMaxTextureSize();
if (newW > max) {
newW = max;
}
if (newH > max) {
newH = max;
}
if (!useNPOT && (newW != working->w || newH != working->h)) { if (newW != working->w || newH != working->h) {
SDL_Surface* resized = SDL_CreateSurface(newW, newH, working->format); SDL_Surface* resized = SDL_CreateSurface(newW, newH, working->format);
if (!resized) { if (!resized) {
SDL_Log("SDL_CreateSurface (resize) failed: %s", SDL_GetError()); SDL_Log("SDL_CreateSurface (resize) failed: %s", SDL_GetError());