Merge branch 'rend2-unified-wip' into rend2-builds

SomaZ · Mar 7, 2024 · 4e70447 · 4e70447
2 parents 7be3463 + 857fda5
commit 4e70447
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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_image_stb.cpp b/shared/rd-rend2/tr_image_stb.cpp
@@ -66,6 +66,11 @@ void R_LoadHDRImage( const char *filename, byte **data, int *width, int *height
 	int len = ri.FS_ReadFile (filename, (void **)&buf);
 	if ( len <= 0 || buf == NULL )
 	{
+		// reset output varialbes
+		*data = NULL;
+		*width = 0;
+		*height = 0;
+
 		return;
 	}
 	stbi_set_flip_vertically_on_load(0);

diff --git 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();