From 725b7ea7f97cb8f5681d9985823c49a8accd6719 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 29 Jan 2024 05:59:06 +0300 Subject: [PATCH] common: render_api: rename TF_ALLOW_NEAREST_TOGGLE to just TF_ALLOW_NEAREST, it's just shorter --- common/render_api.h | 2 +- engine/ref_api.h | 4 ++-- ref/gl/gl_image.c | 2 +- ref/gl/gl_warp.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/render_api.h b/common/render_api.h index 47981e37..8ab2643c 100644 --- a/common/render_api.h +++ b/common/render_api.h @@ -108,7 +108,7 @@ typedef enum TF_NOCOMPARE = (1<<27), // disable comparing for depth textures TF_ARB_16BIT = (1<<28), // keep image as 16-bit (not 24) TF_MULTISAMPLE = (1<<29), // multisampling texture - TF_ALLOW_NEAREST_TOGGLE = (1<<30), // allows toggling nearest filtering for TF_NOMIPMAP textures + TF_ALLOW_NEAREST = (1<<30), // allows toggling nearest filtering for TF_NOMIPMAP textures } texFlags_t; typedef enum diff --git a/engine/ref_api.h b/engine/ref_api.h index 5cb1d474..ce11df90 100644 --- a/engine/ref_api.h +++ b/engine/ref_api.h @@ -46,8 +46,8 @@ GNU General Public License for more details. #define REF_API_VERSION 7 -#define TF_SKY (TF_SKYSIDE|TF_NOMIPMAP|TF_ALLOW_NEAREST_TOGGLE) -#define TF_FONT (TF_NOMIPMAP|TF_CLAMP|TF_ALLOW_NEAREST_TOGGLE) +#define TF_SKY (TF_SKYSIDE|TF_NOMIPMAP|TF_ALLOW_NEAREST) +#define TF_FONT (TF_NOMIPMAP|TF_CLAMP|TF_ALLOW_NEAREST) #define TF_IMAGE (TF_NOMIPMAP|TF_CLAMP) #define TF_DECAL (TF_CLAMP) diff --git a/ref/gl/gl_image.c b/ref/gl/gl_image.c index 6bae8a33..1b602c87 100644 --- a/ref/gl/gl_image.c +++ b/ref/gl/gl_image.c @@ -131,7 +131,7 @@ qboolean GL_TextureFilteringEnabled( const gl_texture_t *tex ) if( FBitSet( tex->flags, TF_ATLAS_PAGE )) return gl_lightmap_nearest.value == 0.0f; - if( FBitSet( tex->flags, TF_ALLOW_NEAREST_TOGGLE )) + if( FBitSet( tex->flags, TF_ALLOW_NEAREST )) return gl_texture_nearest.value == 0.0f; return true; diff --git a/ref/gl/gl_warp.c b/ref/gl/gl_warp.c index e2daa154..961ec55c 100644 --- a/ref/gl/gl_warp.c +++ b/ref/gl/gl_warp.c @@ -882,7 +882,7 @@ void R_InitRipples( void ) pic.numMips = 1; memset( pic.buffer, 0, pic.size ); - g_ripple.rippletexturenum = GL_LoadTextureInternal( "*rippletex", &pic, TF_NOMIPMAP|TF_ALLOW_NEAREST_TOGGLE ); + g_ripple.rippletexturenum = GL_LoadTextureInternal( "*rippletex", &pic, TF_NOMIPMAP|TF_ALLOW_NEAREST ); } static void R_SwapBufs( void )