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

vk: fixup mip auto generation

This commit is contained in:
Ivan Avdeev 2023-10-27 10:50:46 -04:00
parent 96864cf0bd
commit bc26e8150a
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ref/vk/r_textures.c
View File

@ -464,26 +464,23 @@ size_t CalcImageSize( pixformat_t format, int width, int height, int depth ) {
return size;
}
int CalcMipmapCount( vk_texture_t *tex, qboolean haveBuffer )
int CalcMipmapCount( int width, int height, uint32_t flags, qboolean haveBuffer )
{
int width, height;
int mipcount;
ASSERT( tex != NULL );
if( !haveBuffer )// || tex->target == GL_TEXTURE_3D )
return 1;
// generate mip-levels by user request
if( FBitSet( tex->flags, TF_NOMIPMAP ))
if( FBitSet( flags, TF_NOMIPMAP ))
return 1;
// mip-maps can't exceeds 16
for( mipcount = 0; mipcount < 16; mipcount++ )
{
width = Q_max( 1, ( tex->width >> mipcount ));
height = Q_max( 1, ( tex->height >> mipcount ));
if( width == 1 && height == 1 )
const int mip_width = Q_max( 1, ( width >> mipcount ));
const int mip_height = Q_max( 1, ( height >> mipcount ));
if( mip_width == 1 && mip_height == 1 )
break;
}

8
ref/vk/vk_textures.c
View File

@ -47,7 +47,7 @@ static struct {
#define TEXTURES_HASH_SIZE (MAX_TEXTURES >> 2)
size_t CalcImageSize( pixformat_t format, int width, int height, int depth );
int CalcMipmapCount( vk_texture_t *tex, qboolean haveBuffer );
int CalcMipmapCount( int width, int height, uint32_t flags, qboolean haveBuffer );
qboolean validatePicLayers(const char* const name, rgbdata_t *const *const layers, int num_layers);
void BuildMipMap( byte *in, int srcWidth, int srcHeight, int srcDepth, int flags );
@ -380,11 +380,11 @@ static qboolean uploadTexture(int index, vk_texture_t *tex, rgbdata_t *const *co
if (!uploadRawKtx2(index, tex, layers[0]))
return false;
} else {
const qboolean compute_mips = layers[0]->type == PF_RGBA_32 && layers[0]->numMips < 2;
const VkFormat format = VK_GetFormat(layers[0]->type, colorspace_hint);
const int mipCount = compute_mips ? CalcMipmapCount( tex, true ) : layers[0]->numMips;
const int width = layers[0]->width;
const int height = layers[0]->height;
const qboolean compute_mips = layers[0]->type == PF_RGBA_32 && layers[0]->numMips < 2;
const VkFormat format = VK_GetFormat(layers[0]->type, colorspace_hint);
const int mipCount = compute_mips ? CalcMipmapCount( width, height, tex->flags, true ) : layers[0]->numMips;
if (format == VK_FORMAT_UNDEFINED) {
ERR("Unsupported PF format %d", layers[0]->type);