From 9a61f07f2763612c33d5948d13fb32344a66c6dc Mon Sep 17 00:00:00 2001 From: SomaZ <17459161+SomaZ@users.noreply.github.com> Date: Sat, 2 Mar 2024 09:52:29 +0100 Subject: [PATCH] [rend2] Fix sprites related compiler warning rd-rend2/tr_bsp.cpp:4020:25: warning: comparison between NULL and non-pointer ('GLuint' (aka 'unsigned int') and NULL) [-Wnull-arithmetic] Thanks to @ensiform for reporing --- shared/rd-rend2/tr_bsp.cpp | 2 +- shared/rd-rend2/tr_shader.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/shared/rd-rend2/tr_bsp.cpp b/shared/rd-rend2/tr_bsp.cpp index ded23514c8..7cb1d9dc35 100644 --- a/shared/rd-rend2/tr_bsp.cpp +++ b/shared/rd-rend2/tr_bsp.cpp @@ -4024,7 +4024,7 @@ static void R_GenerateSurfaceSprites( const world_t *world, int worldIndex ) for (int i = 0; i < tr.numShaders; i++) { const shader_t *shader = tr.shaders[i]; - if (shader->spriteUbo != NULL) + if (shader->spriteUbo != -1) continue; numSpriteStages += shader->numSurfaceSpriteStages; diff --git a/shared/rd-rend2/tr_shader.cpp b/shared/rd-rend2/tr_shader.cpp index 68e7a9df58..2429d28c73 100644 --- a/shared/rd-rend2/tr_shader.cpp +++ b/shared/rd-rend2/tr_shader.cpp @@ -3802,6 +3802,7 @@ static shader_t *GeneratePermanentShader( void ) { } RB_AddShaderToShaderInstanceUBO(newShader); + newShader->spriteUbo = -1; SortNewShader();