Skip to content

Add channel-reduced and runtime-compressed image formats, rework format detection #1793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
illwieckz wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add channel-reduced and runtime-compressed image formats, rework format detection #1793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
497868c
renderer: implement and detect RED and RG images
illwieckz Aug 6, 2025
6bc3127
renderer: introduce and use IF_NOALPHA
illwieckz Sep 8, 2025
69a11b6
tr_backend: fix a comment
illwieckz Sep 8, 2025
e4efffb
tr_image: rework the alpha detection
illwieckz Sep 8, 2025
dc73fb6
tr_image: flag glyph image with IF_ALPHA
illwieckz Sep 13, 2025
41bd12f
tr_image: document the GL_RGB format
illwieckz Sep 13, 2025
0d4bd31
tr_image: add some GL format checks and asserts
illwieckz Sep 13, 2025
43c4229
tr_image: reshape the cinematic image generation a bit
illwieckz Sep 27, 2025
c458d45
tr_image: reshape the default image painting a bit
illwieckz Sep 27, 2025
bcb66ee
tr_image: make some iterators more local
illwieckz Sep 27, 2025
b32be39
renderer: make possible to compress uncompressed textures
illwieckz Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/engine/renderer/GLUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ struct GLConfig
bool gpuShader4Available;
bool gpuShader5Available;
bool textureGatherAvailable;
bool textureSrgbR8Available;
bool textureSrgbRG8Available;
int maxDrawBuffers;

float maxTextureAnisotropy;
Expand Down
15 changes: 9 additions & 6 deletions src/engine/renderer/tr_backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,12 +782,17 @@ static GLint GL_ToSRGB( GLint internalFormat, bool isSRGB )
{
switch ( format )
{
#if 0 // Not used in the code base.
/* EXT_texture_sRGB_R8 extension.
See: https://github.com/KhronosGroup/OpenGL-Registry/blob/main/extensions/EXT/EXT_texture_sRGB_R8.txt */
case GL_RED:
case GL_R8:
/* EXT_texture_sRGB_R8 extension.
See: https://registry.khronos.org/OpenGL/extensions/EXT/EXT_texture_sRGB_R8.txt */
ASSERT( glConfig.textureSrgbR8Available );
return GL_SR8_EXT;
#endif
case GL_RG8:
/* EXT_texture_sRGB_RG8 extension.
See: https://registry.khronos.org/OpenGL/extensions/EXT/EXT_texture_sRGB_RG8.txt */
ASSERT( glConfig.textureSrgbRG8Available );
return GL_SRG8_EXT;
case GL_RGB:
return GL_SRGB;
case GL_RGBA:
Expand All @@ -796,12 +801,10 @@ static GLint GL_ToSRGB( GLint internalFormat, bool isSRGB )
return GL_SRGB8;
case GL_RGBA8:
return GL_SRGB8_ALPHA8;
#if 0 // Internal formats, should not be used directly.
case GL_COMPRESSED_RGB:
return GL_COMPRESSED_SRGB;
case GL_COMPRESSED_RGBA:
return GL_COMPRESSED_SRGB_ALPHA;
#endif
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
return GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
Expand Down
4 changes: 2 additions & 2 deletions src/engine/renderer/tr_bsp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,8 +483,8 @@ static void R_LoadLightmaps( lump_t *l, const char *bspName )
return;
}

int lightMapBits = IF_LIGHTMAP | IF_NOPICMIP;
int deluxeMapBits = IF_NORMALMAP | IF_NOPICMIP;
int lightMapBits = IF_LIGHTMAP | IF_NOALPHA | IF_NOPICMIP;
int deluxeMapBits = IF_NORMALMAP | IF_NOALPHA | IF_NOPICMIP;

if ( tr.worldLinearizeLightMap )
{
Expand Down
Loading
Loading