Half-Life-RTX
/
xash3d-fwgs
mirror of https://github.com/w23/xash3d-fwgs
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vk: improve logs around skybox loading

This commit is contained in:
Ivan Avdeev 2023-12-19 10:18:57 -05:00
parent d52d44e0ce
commit 7d7535c5c5
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ref/vk/TODO.md
View File

@ -1,6 +1,6 @@
# 2023-12-19 E350
- [x] fixup skybox reflections
- [ ] improve logs "vk/tex: Loaded skybox pbr/env/%.*s"
- [x] improve logs "vk/tex: Loaded skybox pbr/env/%.*s"
- [ ] variable cubemap exposure
- [ ] add skybox test

24
ref/vk/r_textures.c
View File

@ -767,17 +767,21 @@ cleanup:
Mem_Free(data);
}
static qboolean skyboxLoad(const_string_view_t base, const char *prefix) {
static qboolean skyboxLoadF(const char *fmt, ...) {
qboolean success = false;
char loadname[MAX_STRING];
Q_snprintf( loadname, sizeof( loadname ), prefix, base.len, base.s );
char buffer[MAX_STRING];
rgbdata_t *pic = gEngine.FS_LoadImage( loadname, NULL, 0 );
va_list argptr;
va_start( argptr, fmt );
Q_vsnprintf( buffer, sizeof buffer, fmt, argptr );
va_end( argptr );
rgbdata_t *pic = gEngine.FS_LoadImage( buffer, NULL, 0 );
if (!pic)
return false;
if (!(pic->flags & IMAGE_CUBEMAP)) {
ERR("%s: '%s' is invalid: skybox is expected to be a cubemap ", __FUNCTION__, loadname);
ERR("%s: '%s' is invalid: skybox is expected to be a cubemap ", __FUNCTION__, buffer);
goto cleanup;
}
@ -791,18 +795,18 @@ static qboolean skyboxLoad(const_string_view_t base, const char *prefix) {
{
const qboolean is_placeholder = false;
success = R_VkTexturesSkyboxUpload( prefix, pic, kColorspaceGamma, is_placeholder );
success = R_VkTexturesSkyboxUpload( buffer, pic, kColorspaceGamma, is_placeholder );
}
if (success)
skyboxParseInfo(loadname);
skyboxParseInfo(buffer);
cleanup:
if (pic)
gEngine.FS_FreeImage(pic);
if (success)
DEBUG( "Loaded skybox %s", prefix );
DEBUG( "Loaded skybox %s", buffer );
return success;
}
@ -841,11 +845,11 @@ static qboolean skyboxTryLoad( const char *skyboxname, qboolean force_reload ) {
return true;
// Try loading newer "PBR" upscaled skybox first
if (skyboxLoad(basename, "pbr/env/%.*s"))
if (skyboxLoadF("pbr/env/%.*s", basename.len, basename.s))
goto success;
// Try loading original game skybox
if (skyboxLoad(basename, "gfx/env/%.*s"))
if (skyboxLoadF("gfx/env/%.*s", basename.len, basename.s))
goto success;
skyboxUnload();