vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: introduce REF_GET_*_PTR for gamma tables

Browse source
This commit is contained in:
Alibek Omarov 2024-11-02 22:11:22 +03:00
parent b39d660189
commit 8af995cc28
14 changed files with 121 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
engine/client/cl_render.c
View file

@ -215,6 +215,11 @@ intptr_t CL_RenderGetParm( const int parm, const int arg, const qboolean checkRe
return (intptr_t)&clgame.palette;
case PARM_GET_VIEWENT_PTR:
return (intptr_t)&clgame.viewent;
case PARM_GET_TEXGAMMATABLE_PTR:
case PARM_GET_LIGHTGAMMATABLE_PTR:
case PARM_GET_SCREENGAMMATABLE_PTR:
case PARM_GET_LINEARGAMMATABLE_PTR:
return V_GetGammaPtr( parm );
}
}
return 0;

17
engine/client/gamma.c
View file

@ -223,6 +223,23 @@ uint LinearGammaTable( uint b )
return lineargammatable[b];
}
intptr_t V_GetGammaPtr( int parm )
{
switch( parm )
{
case PARM_GET_TEXGAMMATABLE_PTR:
return (intptr_t)texgammatable;
case PARM_GET_LIGHTGAMMATABLE_PTR:
return (intptr_t)lightgammatable;
case PARM_GET_SCREENGAMMATABLE_PTR:
return (intptr_t)screengammatable;
case PARM_GET_LINEARGAMMATABLE_PTR:
return (intptr_t)lineargammatable;
}
return 0;
}
#if XASH_ENGINE_TESTS
#include "tests.h"

1
engine/common/common.h
View file

@ -828,6 +828,7 @@ uint LinearGammaTable( uint );
void V_Init( void );
void V_CheckGamma( void );
void V_CheckGammaEnd( void );
intptr_t V_GetGammaPtr( int parm );
//
// identification.c

5
engine/ref_api.h
View file

@ -291,6 +291,11 @@ typedef enum
PARM_GET_PALETTE_PTR = -14, // clgame.palette
PARM_GET_VIEWENT_PTR = -15, // clgame.viewent
PARM_GET_TEXGAMMATABLE_PTR = -16,
PARM_GET_LIGHTGAMMATABLE_PTR = -17,
PARM_GET_SCREENGAMMATABLE_PTR = -18,
PARM_GET_LINEARGAMMATABLE_PTR = -19,
// implemented by ref_dll
// returns non-null integer if filtering is enabled for texture

2
ref/gl/gl_alias.c
View file

@ -800,7 +800,7 @@ static void R_AliasLighting( float *lv, const vec3_t normal )
illum = bound( 0.0f, illum, 255.0f );
*lv = gEngfuncs.LightToTexGammaEx( illum * 4 ) / 1023.0f;
*lv = LightToTexGamma( illum * 4 ) / 1023.0f;
}
/*

33
ref/gl/gl_local.h
View file

@ -257,6 +257,10 @@ typedef struct
movevars_t *movevars;
color24 *palette;
cl_entity_t *viewent;
byte *texgammatable;
uint *lightgammatable;
uint *lineargammatable;
uint *screengammatable;
uint max_entities;
} gl_globals_t;
@ -730,6 +734,35 @@ static inline model_t *CL_ModelHandle( int index )
return gp_cl->models[index];
}
static inline byte TextureToGamma( byte b )
{
return !FBitSet( gp_host->features, ENGINE_LINEAR_GAMMA_SPACE ) ? tr.texgammatable[b] : b;
}
static inline uint LightToTexGamma( uint b )
{
if( unlikely( b >= 1024 ))
return 0;
return !FBitSet( gp_host->features, ENGINE_LINEAR_GAMMA_SPACE ) ? tr.lightgammatable[b] : b;
}
static inline uint ScreenGammaTable( uint b )
{
if( unlikely( b >= 1024 ))
return 0;
return !FBitSet( gp_host->features, ENGINE_LINEAR_GAMMA_SPACE ) ? tr.screengammatable[b] : b;
}
static inline uint LinearGammaTable( uint b )
{
if( unlikely( b >= 1024 ))
return 0;
return !FBitSet( gp_host->features, ENGINE_LINEAR_GAMMA_SPACE ) ? tr.lineargammatable[b] : b;
}
#define WORLDMODEL (gp_cl->models[1])
//

4
ref/gl/gl_opengl.c
View file

@ -1300,6 +1300,10 @@ qboolean R_Init( void )
tr.movevars = (movevars_t *)ENGINE_GET_PARM( PARM_GET_MOVEVARS_PTR );
tr.palette = (color24 *)ENGINE_GET_PARM( PARM_GET_PALETTE_PTR );
tr.viewent = (cl_entity_t *)ENGINE_GET_PARM( PARM_GET_VIEWENT_PTR );
tr.texgammatable = (byte *)ENGINE_GET_PARM( PARM_GET_TEXGAMMATABLE_PTR );
tr.lightgammatable = (uint *)ENGINE_GET_PARM( PARM_GET_LIGHTGAMMATABLE_PTR );
tr.screengammatable = (uint *)ENGINE_GET_PARM( PARM_GET_SCREENGAMMATABLE_PTR );
tr.lineargammatable = (uint *)ENGINE_GET_PARM( PARM_GET_LINEARGAMMATABLE_PTR );
GL_SetDefaults();
R_CheckVBO();

2
ref/gl/gl_rsurf.c
View file

@ -787,7 +787,7 @@ static void R_BuildLightMap( const msurface_t *surf, byte *dest, int stride, qbo
if( t > 1023 )
t = 1023;
dst[i] = gEngfuncs.LightToTexGammaEx( t ) >> 2;
dst[i] = LightToTexGamma( t ) >> 2;
}
dst[3] = 255;
}

12
ref/gl/gl_studio.c
View file

@ -1572,9 +1572,9 @@ static void R_StudioEntityLight( alight_t *lightinfo )
if( k != -1 )
{
g_studio.locallightcolor[k][0] = gEngfuncs.LinearGammaTable( el->color.r << 2 );
g_studio.locallightcolor[k][1] = gEngfuncs.LinearGammaTable( el->color.g << 2 );
g_studio.locallightcolor[k][2] = gEngfuncs.LinearGammaTable( el->color.b << 2 );
g_studio.locallightcolor[k][0] = LinearGammaTable( el->color.r << 2 );
g_studio.locallightcolor[k][1] = LinearGammaTable( el->color.g << 2 );
g_studio.locallightcolor[k][2] = LinearGammaTable( el->color.b << 2 );
g_studio.locallightR2[k] = r2;
g_studio.locallight[k] = el;
lstrength[k] = minstrength;
@ -1670,7 +1670,7 @@ static void R_StudioLighting( float *lv, int bone, int flags, vec3_t normal )
illum = Q_min( illum, 255.0f );
*lv = gEngfuncs.LightToTexGammaEx( illum * 4 ) / 1023.0f;
*lv = LightToTexGamma( illum * 4 ) / 1023.0f;
}
/*
@ -1725,12 +1725,12 @@ static void R_LightLambert( vec4_t light[MAX_LOCALLIGHTS], const vec3_t normal,
{
for( i = 0; i < 3; i++ )
{
float c = finalLight[i] + gEngfuncs.LinearGammaTable( color[i] * 1023.0f );
float c = finalLight[i] + LinearGammaTable( color[i] * 1023.0f );
if( c > 1023.0f )
out[i] = 255;
else
out[i] = gEngfuncs.ScreenGammaTable( c ) >> 2;
out[i] = ScreenGammaTable( c ) >> 2;
}
}
else

33
ref/soft/r_local.h
View file

@ -297,6 +297,10 @@ typedef struct
movevars_t *movevars;
color24 *palette;
cl_entity_t *viewent;
byte *texgammatable;
uint *lightgammatable;
uint *lineargammatable;
uint *screengammatable;
uint max_entities;
} gl_globals_t;
@ -691,6 +695,35 @@ static inline model_t *CL_ModelHandle( int index )
return gp_cl->models[index];
}
static inline byte TextureToGamma( byte b )
{
return !FBitSet( gp_host->features, ENGINE_LINEAR_GAMMA_SPACE ) ? tr.texgammatable[b] : b;
}
static inline uint LightToTexGamma( uint b )
{
if( unlikely( b >= 1024 ))
return 0;
return !FBitSet( gp_host->features, ENGINE_LINEAR_GAMMA_SPACE ) ? tr.lightgammatable[b] : b;
}
static inline uint ScreenGammaTable( uint b )
{
if( unlikely( b >= 1024 ))
return 0;
return !FBitSet( gp_host->features, ENGINE_LINEAR_GAMMA_SPACE ) ? tr.screengammatable[b] : b;
}
static inline uint LinearGammaTable( uint b )
{
if( unlikely( b >= 1024 ))
return 0;
return !FBitSet( gp_host->features, ENGINE_LINEAR_GAMMA_SPACE ) ? tr.lineargammatable[b] : b;
}
#define WORLDMODEL (gp_cl->models[1])
// todo: gl_cull.c

4
ref/soft/r_main.c
View file

@ -1897,6 +1897,10 @@ qboolean GAME_EXPORT R_Init( void )
tr.movevars = (movevars_t *)ENGINE_GET_PARM( PARM_GET_MOVEVARS_PTR );
tr.palette = (color24 *)ENGINE_GET_PARM( PARM_GET_PALETTE_PTR );
tr.viewent = (cl_entity_t *)ENGINE_GET_PARM( PARM_GET_VIEWENT_PTR );
tr.texgammatable = (byte *)ENGINE_GET_PARM( PARM_GET_TEXGAMMATABLE_PTR );
tr.lightgammatable = (uint *)ENGINE_GET_PARM( PARM_GET_LIGHTGAMMATABLE_PTR );
tr.screengammatable = (uint *)ENGINE_GET_PARM( PARM_GET_SCREENGAMMATABLE_PTR );
tr.lineargammatable = (uint *)ENGINE_GET_PARM( PARM_GET_LINEARGAMMATABLE_PTR );
if( !R_InitBlit( glblit ))
{

6
ref/soft/r_part.c
View file

@ -90,9 +90,9 @@ void GAME_EXPORT CL_DrawParticles( double frametime, particle_t *cl_active_parti
if( alpha > 255 || p->type == pt_static )
alpha = 255;
//TriColor4ub( gEngfuncs.LightToTexGamma( color.r ),
// gEngfuncs.LightToTexGamma( color.g ),
// gEngfuncs.LightToTexGamma( color.b ), alpha );
//TriColor4ub( LightToTexGamma( color.r ),
// LightToTexGamma( color.g ),
// LightToTexGamma( color.b ), alpha );
//TriBrightness( alpha / 255.0f );
_TriColor4f(1.0f*alpha/255/255*color.r,1.0f*alpha/255/255*color.g,1.0f*alpha/255/255* color.b,1.0f );

12
ref/soft/r_studio.c
View file

@ -1571,9 +1571,9 @@ static void R_StudioEntityLight( alight_t *lightinfo )
if( k != -1 )
{
g_studio.locallightcolor[k][0] = gEngfuncs.LinearGammaTable( el->color.r << 2 );
g_studio.locallightcolor[k][1] = gEngfuncs.LinearGammaTable( el->color.g << 2 );
g_studio.locallightcolor[k][2] = gEngfuncs.LinearGammaTable( el->color.b << 2 );
g_studio.locallightcolor[k][0] = LinearGammaTable( el->color.r << 2 );
g_studio.locallightcolor[k][1] = LinearGammaTable( el->color.g << 2 );
g_studio.locallightcolor[k][2] = LinearGammaTable( el->color.b << 2 );
g_studio.locallightR2[k] = r2;
g_studio.locallight[k] = el;
lstrength[k] = minstrength;
@ -1669,7 +1669,7 @@ static void R_StudioLighting( float *lv, int bone, int flags, vec3_t normal )
illum = Q_min( illum, 255.0f );
*lv = gEngfuncs.LightToTexGammaEx( illum * 4 ) / 1023.0f;
*lv = LightToTexGamma( illum * 4 ) / 1023.0f;
}
/*
@ -1724,12 +1724,12 @@ static void R_LightLambert( vec4_t light[MAX_LOCALLIGHTS], const vec3_t normal,
{
for( i = 0; i < 3; i++ )
{
float c = finalLight[i] + gEngfuncs.LinearGammaTable( color[i] * 1023.0f );
float c = finalLight[i] + LinearGammaTable( color[i] * 1023.0f );
if( c > 1023.0f )
out[i] = 255;
else
out[i] = gEngfuncs.ScreenGammaTable( c ) >> 2;
out[i] = ScreenGammaTable( c ) >> 2;
}
}
else

4
ref/soft/r_surf.c
View file

@ -137,7 +137,7 @@ static void R_AddDynamicLights( const msurface_t *surf )
sl = DotProduct( impact, info->lmvecs[0] ) + info->lmvecs[0][3] - info->lightmapmins[0];
tl = DotProduct( impact, info->lmvecs[1] ) + info->lmvecs[1][3] - info->lightmapmins[1];
monolight = gEngfuncs.LightToTexGamma(( dl->color.r + dl->color.g + dl->color.b ) / 3 ) * 3;
monolight = LightToTexGamma(( dl->color.r + dl->color.g + dl->color.b ) / 3 * 4 ) * 3;
for( t = 0; t < tmax; t++ )
{
@ -222,7 +222,7 @@ static void R_BuildLightMap( void )
for( i = 0; i < size; i++ )
{
if( blocklights[i] < 65280 )
t = gEngfuncs.LightToTexGammaEx( blocklights[i] >> 6 ) << 6;
t = LightToTexGamma( blocklights[i] >> 6 ) << 6;
else t = (int)blocklights[i];
t = bound( 0, t, 65535 * 3 );