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

ref: gl: store ripple texture in texture's fb_texturenum as it's only used for water and water don't have luma

Browse source
This commit is contained in:
Alibek Omarov 2025-01-18 08:38:43 +03:00
parent ea338adc46
commit 0a41b70e44
3 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ref/gl/gl_image.c
View file

@ -2338,7 +2338,6 @@ void R_InitImages( void )
// validate cvars // validate cvars
R_SetTextureParameters(); R_SetTextureParameters();
GL_CreateInternalTextures(); GL_CreateInternalTextures();
R_InitRipples();
gEngfuncs.Cmd_AddCommand( "texturelist", R_TextureList_f, "display loaded textures list" ); gEngfuncs.Cmd_AddCommand( "texturelist", R_TextureList_f, "display loaded textures list" );
} }

3
ref/gl/gl_local.h
View file

@ -503,10 +503,9 @@ void R_DrawSkyBox( void );
void R_DrawClouds( void ); void R_DrawClouds( void );
void R_UnloadSkybox( void ); void R_UnloadSkybox( void );
void EmitWaterPolys( msurface_t *warp, qboolean reverse, qboolean ripples ); void EmitWaterPolys( msurface_t *warp, qboolean reverse, qboolean ripples );
void R_InitRipples( void );
void R_ResetRipples( void ); void R_ResetRipples( void );
void R_AnimateRipples( void ); void R_AnimateRipples( void );
qboolean R_UploadRipples( const texture_t *image ); qboolean R_UploadRipples( texture_t *image );
//#include "vid_common.h" //#include "vid_common.h"

56
ref/gl/gl_warp.c
View file

@ -79,8 +79,6 @@ static struct
qboolean update; qboolean update;
uint32_t texture[RIPPLES_TEXSIZE]; uint32_t texture[RIPPLES_TEXSIZE];
int gl_texturenum;
int rippletexturenum;
} g_ripple; } g_ripple;
@ -655,22 +653,6 @@ void R_ResetRipples( void )
memset( g_ripple.buf, 0, sizeof( g_ripple.buf )); memset( g_ripple.buf, 0, sizeof( g_ripple.buf ));
} }
void R_InitRipples( void )
{
rgbdata_t pic = { 0 };
pic.width = pic.height = RIPPLES_CACHEWIDTH;
pic.depth = 1;
pic.flags = IMAGE_HAS_COLOR;
pic.buffer = (byte *)g_ripple.texture;
pic.type = PF_RGBA_32;
pic.size = sizeof( g_ripple.texture );
pic.numMips = 1;
memset( pic.buffer, 0, pic.size );
g_ripple.rippletexturenum = GL_LoadTextureInternal( "*rippletex", &pic, TF_NOMIPMAP|TF_ALLOW_NEAREST );
}
static void R_SwapBufs( void ) static void R_SwapBufs( void )
{ {
short *tempbufp = g_ripple.curbuf; short *tempbufp = g_ripple.curbuf;
@ -738,7 +720,7 @@ void R_AnimateRipples( void )
R_RunRipplesAnimation( g_ripple.oldbuf, g_ripple.curbuf ); R_RunRipplesAnimation( g_ripple.oldbuf, g_ripple.curbuf );
} }
qboolean R_UploadRipples( const texture_t *image ) qboolean R_UploadRipples( texture_t *image )
{ {
const gl_texture_t *glt; const gl_texture_t *glt;
const uint32_t *pixels; const uint32_t *pixels;
@ -759,16 +741,6 @@ qboolean R_UploadRipples( const texture_t *image )
return false; return false;
} }
GL_Bind( XASH_TEXTURE0, g_ripple.rippletexturenum );
// no updates this frame
if( !g_ripple.update && image->gl_texturenum == g_ripple.gl_texturenum )
return true;
g_ripple.gl_texturenum = image->gl_texturenum;
size = r_ripple.value == 1.0f ? 64 : RIPPLES_CACHEWIDTH;
// try to preserve aspect ratio // try to preserve aspect ratio
width = height = RIPPLES_CACHEWIDTH; // always render at maximum size width = height = RIPPLES_CACHEWIDTH; // always render at maximum size
if( image->width > image->height ) if( image->width > image->height )
@ -776,6 +748,32 @@ qboolean R_UploadRipples( const texture_t *image )
else if( image->width < image->height ) else if( image->width < image->height )
width = (float)image->width / image->height * height; width = (float)image->width / image->height * height;
if( !image->fb_texturenum )
{
rgbdata_t pic = { 0 };
string name;
Q_snprintf( name, sizeof( name ), "*rippletex_%s", image->name );
pic.width = width;
pic.height = height;
pic.depth = 1;
pic.flags = IMAGE_HAS_COLOR;
pic.buffer = (byte *)g_ripple.texture;
pic.type = PF_RGBA_32;
pic.size = width * height * 4;
pic.numMips = 1;
memset( pic.buffer, 0, pic.size );
image->fb_texturenum = GL_LoadTextureInternal( name, &pic, TF_NOMIPMAP | TF_ALLOW_NEAREST );
}
GL_Bind( XASH_TEXTURE0, image->fb_texturenum );
// no updates this frame
if( !g_ripple.update )
return true;
size = r_ripple.value == 1.0f ? 64 : RIPPLES_CACHEWIDTH;
pixels = (const uint32_t *)glt->original->buffer; pixels = (const uint32_t *)glt->original->buffer;
for( y = 0; y < height; y++ ) for( y = 0; y < height; y++ )