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

vk: incapsulate skybox textures

This commit is contained in:
Ivan Avdeev 2023-10-20 13:04:33 -04:00
parent af032bd2be
commit ab6f18fc32
4 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ref/vk/r_textures.h
View File

@ -1,12 +1,9 @@
#pragma once
#include "xash3d_types.h"
#include "const.h" // required for ref_api.h
#include "cvardef.h"
#include "com_model.h"
#include "ref_api.h" // needed for render_api.h
#include "render_api.h" // texFlags_t
#include "com_image.h"
#include "const.h" // required for com_model.h, ref_api.h
#include "cvardef.h" // required for ref_api.h
#include "com_model.h" // required for ref_api.h
#include "ref_api.h" // texFlags_t
qboolean R_TexturesInit( void );
void R_TexturesShutdown( void );

6
ref/vk/vk_rtx.c
View File

@ -123,11 +123,7 @@ void VK_RayNewMap( void ) {
.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
// FIXME we should pick tglob.dii_all_textures here directly
.value = (vk_descriptor_value_t){
.image = {
.sampler = tglob.default_sampler_fixme,
.imageView = tglob.skybox_cube.vk.image.view ? tglob.skybox_cube.vk.image.view : tglob.cubemap_placeholder.vk.image.view,
.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
},
.image = R_VkTextureGetSkyboxDescriptorImageInfo(),
},
};
}

54
ref/vk/vk_textures.c
View File

@ -18,7 +18,6 @@
#include "ktx2.h"
#include <math.h> // sqrt
vk_textures_global_t tglob = {0};
@ -32,6 +31,15 @@ static struct {
int size_total;
} stats;
struct {
uint32_t flags;
VkSampler sampler;
} samplers[MAX_SAMPLERS];
VkSampler default_sampler;
vk_texture_t cubemap_placeholder;
//vk_texture_t textures[MAX_TEXTURES];
//alo_int_pool_t textures_free;
} g_textures;
@ -65,8 +73,8 @@ qboolean R_VkTexturesInit( void ) {
// TODO really check device caps for this
gEngine.Image_AddCmdFlags( IL_DDS_HARDWARE | IL_KTX2_RAW );
tglob.default_sampler_fixme = pickSamplerForFlags(0);
ASSERT(tglob.default_sampler_fixme != VK_NULL_HANDLE);
g_textures.default_sampler = pickSamplerForFlags(0);
ASSERT(g_textures.default_sampler != VK_NULL_HANDLE);
/* FIXME
// validate cvars
@ -91,7 +99,7 @@ qboolean R_VkTexturesInit( void ) {
tglob.dii_all_textures[i] = (VkDescriptorImageInfo){
.imageView = default_view,
.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
.sampler = tglob.default_sampler_fixme,
.sampler = g_textures.default_sampler,
};
}
}
@ -107,14 +115,14 @@ void R_VkTexturesShutdown( void ) {
unloadSkybox();
R_VkImageDestroy(&tglob.cubemap_placeholder.vk.image);
g_textures.stats.size_total -= tglob.cubemap_placeholder.total_size;
R_VkImageDestroy(&g_textures.cubemap_placeholder.vk.image);
g_textures.stats.size_total -= g_textures.cubemap_placeholder.total_size;
g_textures.stats.count--;
memset(&tglob.cubemap_placeholder, 0, sizeof(tglob.cubemap_placeholder));
memset(&g_textures.cubemap_placeholder, 0, sizeof(g_textures.cubemap_placeholder));
for (int i = 0; i < COUNTOF(tglob.samplers); ++i) {
if (tglob.samplers[i].sampler != VK_NULL_HANDLE)
vkDestroySampler(vk_core.device, tglob.samplers[i].sampler, NULL);
for (int i = 0; i < COUNTOF(g_textures.samplers); ++i) {
if (g_textures.samplers[i].sampler != VK_NULL_HANDLE)
vkDestroySampler(vk_core.device, g_textures.samplers[i].sampler, NULL);
}
}
@ -279,7 +287,7 @@ static void VK_CreateInternalTextures( void )
sides[4] = pic;
sides[5] = pic;
uploadTexture( &tglob.cubemap_placeholder, sides, 6, true, kColorspaceGamma );
uploadTexture( &g_textures.cubemap_placeholder, sides, 6, true, kColorspaceGamma );
}
loadBlueNoiseTextures();
@ -369,18 +377,18 @@ static VkSampler createSamplerForFlags( texFlags_t flags ) {
static VkSampler pickSamplerForFlags( texFlags_t flags ) {
flags &= (TF_BORDER | TF_CLAMP | TF_NEAREST);
for (int i = 0; i < COUNTOF(tglob.samplers); ++i) {
if (tglob.samplers[i].sampler == VK_NULL_HANDLE) {
tglob.samplers[i].flags = flags;
return tglob.samplers[i].sampler = createSamplerForFlags(flags);
for (int i = 0; i < COUNTOF(g_textures.samplers); ++i) {
if (g_textures.samplers[i].sampler == VK_NULL_HANDLE) {
g_textures.samplers[i].flags = flags;
return g_textures.samplers[i].sampler = createSamplerForFlags(flags);
}
if (tglob.samplers[i].flags == flags)
return tglob.samplers[i].sampler;
if (g_textures.samplers[i].flags == flags)
return g_textures.samplers[i].sampler;
}
ERR("Couldn't find/allocate sampler for flags %x", flags);
return tglob.default_sampler_fixme;
return g_textures.default_sampler;
}
static void setDescriptorSet(vk_texture_t* const tex, colorspace_hint_e colorspace_hint) {
@ -726,3 +734,13 @@ void R_TextureAcquire( unsigned int texnum ) {
DEBUG("Acquiring existing texture %s(%d) refcount=%d", tex->name, (int)(tex-vk_textures), tex->refcount);
}
VkDescriptorImageInfo R_VkTextureGetSkyboxDescriptorImageInfo( void ) {
return (VkDescriptorImageInfo){
.sampler = g_textures.default_sampler,
.imageView = tglob.skybox_cube.vk.image.view
? tglob.skybox_cube.vk.image.view
: g_textures.cubemap_placeholder.vk.image.view,
.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
};
}

24
ref/vk/vk_textures.h
View File

@ -3,19 +3,12 @@
#include "vk_image.h"
#include "vk_const.h"
#include "const.h" // required for ref_api.h
#include "cvardef.h"
#include "com_model.h"
#include "ref_api.h" // needed for render_api.h
#include "render_api.h"
#include "com_image.h"
typedef struct vk_texture_s
{
char name[256];
int width, height;
texFlags_t flags;
uint32_t flags;
int total_size;
struct {
@ -61,21 +54,14 @@ typedef struct vk_textures_global_s
// Hardcode blue noise texture size to 64x64x64
#define BLUE_NOISE_SIZE 64
qboolean fCustomSkybox; // TODO do we need this for anything?
// TODO wire it up for ref_interface_t return
qboolean fCustomSkybox;
// TODO move to vk_textures/g_textures
vk_texture_t skybox_cube;
vk_texture_t cubemap_placeholder;
// All textures descriptors in their native formats used for RT
VkDescriptorImageInfo dii_all_textures[MAX_TEXTURES];
// FIXME this should not exist, all textures should have their own samplers based on flags
VkSampler default_sampler_fixme;
struct {
texFlags_t flags;
VkSampler sampler;
} samplers[MAX_SAMPLERS];
} vk_textures_global_t;
// TODO rename this consistently
@ -110,3 +96,5 @@ int R_TextureFindByNameLike( const char *texture_name );
// Used by materials to piggy-back onto texture name-to-index hash table
int R_TextureCreateDummy_FIXME( const char *name );
VkDescriptorImageInfo R_VkTextureGetSkyboxDescriptorImageInfo( void );