Skip to content

Commit 81aa341

Browse files
illwieckzillwieckz
committed
renderer: implement and detect RG images
1 parent cdbd9b6 commit 81aa341

File tree

5 files changed

+90
-17
lines changed

5 files changed

+90
-17
lines changed

‎src/engine/renderer/tr_backend.cpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -739,11 +739,17 @@ static GLint GL_ToSRGB( GLint internalFormat, bool isSRGB )
739739
{
740740
switch ( format )
741741
{
742-
/* EXT_texture_sRGB_R8 extension.
743-
See: https://github.com/KhronosGroup/OpenGL-Registry/blob/main/extensions/EXT/EXT_texture_sRGB_R8.txt */
744742
case GL_RED:
743+
case GL_R8:
744+
/* EXT_texture_sRGB_R8 extension.
745+
See: https://registry.khronos.org/OpenGL/extensions/EXT/EXT_texture_sRGB_R8.txt */
745746
ASSERT( glConfig.textureSrgbR8Available );
746747
return GL_SR8_EXT;
748+
case GL_RG8:
749+
/* EXT_texture_sRGB_RG8 extension.
750+
See: https://registry.khronos.org/OpenGL/extensions/EXT/EXT_texture_sRGB_RG8.txt */
751+
ASSERT( glConfig.textureSrgbRG8Available );
752+
return GL_SRG8_EXT;
747753
case GL_RGB:
748754
return GL_SRGB;
749755
case GL_RGBA:

‎src/engine/renderer/tr_image.cpp‎

Lines changed: 72 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,12 @@ class ListImagesCmd : public Cmd::StaticCmd
177177
{ GL_RGBA32UI, { "RGBA32UI", 16 } },
178178
{ GL_ALPHA16F_ARB, { "A16F", 2 } },
179179
{ GL_ALPHA32F_ARB, { "A32F", 4 } },
180+
{ GL_R8, { "R8", 1 } },
180181
{ GL_R16F, { "R16F", 2 } },
181182
{ GL_R32F, { "R32F", 4 } },
182183
{ GL_LUMINANCE_ALPHA16F_ARB, { "LA16F", 4 } },
183184
{ GL_LUMINANCE_ALPHA32F_ARB, { "LA32F", 8 } },
185+
{ GL_RG8, { "RG8", 2 } },
184186
{ GL_RG16F, { "RG16F", 4 } },
185187
{ GL_RG32F, { "RG32F", 8 } },
186188

@@ -946,7 +948,19 @@ void R_UploadImage( const char *name, const byte **dataArray, int numLayers, int
946948
}
947949
else
948950
{
949-
internalFormat = GL_RED;
951+
internalFormat = glConfig.textureSrgbRG8Available ? GL_R8 : GL_RED;
952+
}
953+
}
954+
else if ( image->bits & IF_RG )
955+
{
956+
if ( isSRGB && !glConfig.textureSrgbRG8Available )
957+
{
958+
Log::Warn("red-green image '%s' cannot be loaded as sRGB", image->name );
959+
internalFormat = GL_RGB8;
960+
}
961+
else
962+
{
963+
internalFormat = GL_RG8;
950964
}
951965
}
952966
else if ( image->bits & ( IF_RGBA16F | IF_RGBA32F | IF_TWOCOMP16F | IF_TWOCOMP32F | IF_ONECOMP16F | IF_ONECOMP32F ) )
@@ -1094,31 +1108,70 @@ void R_UploadImage( const char *name, const byte **dataArray, int numLayers, int
10941108

10951109
if ( internalFormat == GL_RGB8 )
10961110
{
1097-
if ( isSRGB && !glConfig.textureSrgbR8Available )
1098-
{
1099-
break;
1100-
}
1101-
11021111
/* Scan the texture for green and blue channels' max values
11031112
and verify if the green and blue channels are being used or not. */
11041113

11051114
c = image->width * image->height;
11061115
scan = dataArray[0];
11071116

1108-
internalFormat = GL_RED;
1117+
bool hasGreen = false;
1118+
bool hasBlue = false;
11091119

11101120
for ( i = 0; i < c * 4; i += 4 )
11111121
{
1112-
if ( scan[ i + 1 ] != 0 )
1122+
if ( scan[ i + 2 ] != 0 )
11131123
{
1114-
internalFormat = GL_RGB8;
1124+
// We need GL_RGB8.
1125+
hasBlue = true;
11151126
break;
11161127
}
11171128

1118-
if ( scan[ i + 2 ] != 0 )
1129+
if ( scan[ i + 1 ] != 0 )
11191130
{
1120-
internalFormat = GL_RGB8;
1121-
break;
1131+
hasGreen = true;
1132+
1133+
if ( !glConfig.textureRGAvailable )
1134+
{
1135+
// We can't store RG so we can stop there and use GL_RGB8.
1136+
break;
1137+
}
1138+
// Else continue to make sure there is no blue at all.
1139+
}
1140+
1141+
// Else use GL_RED or GL_R8.
1142+
}
1143+
1144+
if ( hasBlue )
1145+
{
1146+
// Keep GL_RGB8.
1147+
}
1148+
else if ( hasGreen )
1149+
{
1150+
if ( !glConfig.textureRGAvailable )
1151+
{
1152+
// Keep GL_RGB8.
1153+
}
1154+
else
1155+
{
1156+
if ( isSRGB && !glConfig.textureSrgbRG8Available )
1157+
{
1158+
// Keep GL_RGB8.
1159+
}
1160+
else
1161+
{
1162+
internalFormat = GL_RG8;
1163+
}
1164+
}
1165+
}
1166+
else
1167+
{
1168+
if ( isSRGB && !glConfig.textureSrgbR8Available )
1169+
{
1170+
// Keep GL_RGB8.
1171+
}
1172+
else
1173+
{
1174+
internalFormat = glConfig.textureRGAvailable ? GL_R8 : GL_RED;
11221175
}
11231176
}
11241177
}
@@ -2815,8 +2868,15 @@ void R_CreateBuiltinImages()
28152868

28162869
imageParams.bits = IF_NOPICMIP;
28172870

2871+
if ( glConfig.textureRGAvailable )
2872+
{
2873+
imageParams.bits |= IF_RG;
2874+
}
2875+
28182876
tr.greenImage = R_CreateImage( "_green", ( const byte ** ) &dataPtr, DIMENSION, DIMENSION, 1, imageParams );
28192877

2878+
imageParams.bits = IF_NOPICMIP;
2879+
28202880
// blue
28212881
for ( x = DIMENSION * DIMENSION, out = data; x; --x, out += 4 )
28222882
{

‎src/engine/renderer/tr_local.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,8 @@ enum class ssaoMode {
485485
IF_BC5 = BIT( 23 ),
486486
IF_RGBA32UI = BIT( 24 ),
487487
IF_HOMEPATH = BIT( 25 ),
488-
IF_NOALPHA = BIT( 26 )
488+
IF_NOALPHA = BIT( 26 ),
489+
IF_RG = BIT(27)
489490
};
490491

491492
enum class filterType_t

‎src/engine/renderer/tr_public.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ struct GLConfig
139139
bool gpuShader5Available;
140140
bool textureGatherAvailable;
141141
bool textureSrgbR8Available;
142+
bool textureSrgbRG8Available;
142143
int maxDrawBuffers;
143144

144145
float maxTextureAnisotropy;

‎src/engine/sys/sdl_glimp.cpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ static Cvar::Cvar<bool> r_arb_texture_barrier( "r_arb_texture_barrier",
106106
"Use GL_ARB_texture_barrier if available", Cvar::NONE, true );
107107
static Cvar::Cvar<bool> r_arb_texture_gather( "r_arb_texture_gather",
108108
"Use GL_ARB_texture_gather if available", Cvar::NONE, true );
109+
static Cvar::Cvar<bool> r_arb_texture_rg( "r_arb_texture_rg",
110+
"Use GL_ARB_texture_rg if available", Cvar::NONE, true );
109111
static Cvar::Cvar<bool> r_arb_uniform_buffer_object( "r_arb_uniform_buffer_object",
110112
"Use GL_ARB_uniform_buffer_object if available", Cvar::NONE, true );
111113
static Cvar::Cvar<bool> r_arb_vertex_attrib_binding( "r_arb_vertex_attrib_binding",
@@ -120,10 +122,10 @@ static Cvar::Cvar<bool> r_ext_texture_float( "r_ext_texture_float",
120122
"Use GL_EXT_texture_float if available", Cvar::NONE, true );
121123
static Cvar::Cvar<bool> r_ext_texture_integer( "r_ext_texture_integer",
122124
"Use GL_EXT_texture_integer if available", Cvar::NONE, true );
123-
static Cvar::Cvar<bool> r_ext_texture_rg( "r_ext_texture_rg",
124-
"Use GL_EXT_texture_rg if available", Cvar::NONE, true );
125125
static Cvar::Cvar<bool> r_ext_texture_srgb_r8( "r_ext_texture_srgb_r8",
126126
"Use GL_EXT_texture_sRGB_R8 if available", Cvar::NONE, true );
127+
static Cvar::Cvar<bool> r_ext_texture_srgb_rg8( "r_ext_texture_srgb_rg8",
128+
"Use GL_EXT_texture_sRGB_RG8 if available", Cvar::NONE, true );
127129
static Cvar::Cvar<bool> r_khr_debug( "r_khr_debug",
128130
"Use GL_KHR_debug if available", Cvar::NONE, true );
129131
static Cvar::Cvar<bool> r_khr_shader_subgroup( "r_khr_shader_subgroup",
@@ -2215,6 +2217,9 @@ static void GLimp_InitExtensions()
22152217

22162218
glConfig.textureSrgbR8Available = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, EXT_texture_sRGB_R8, r_ext_texture_srgb_r8.Get() );
22172219

2220+
// Texture - others
2221+
glConfig.textureSrgbRG8Available = LOAD_EXTENSION_WITH_TEST( ExtFlag_NONE, EXT_texture_sRGB_RG8, r_ext_texture_srgb_rg8.Get() );
2222+
22182223
// Texture - others
22192224
glConfig.textureAnisotropyAvailable = false;
22202225
glConfig.textureAnisotropy = 0.0f;

0 commit comments

Comments
 (0)