vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ref: gl: try to match texture slot and texture object handle because of buggy games

Browse source
This commit is contained in:
Alibek Omarov 2024-06-15 19:10:20 +03:00
parent b41591a527
commit 260edc2a08
1 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
ref/gl/gl_image.c
View file

@ -1392,40 +1392,54 @@ GL_AllocTexture
*/ */
static gl_texture_t *GL_AllocTexture( const char *name, texFlags_t flags ) static gl_texture_t *GL_AllocTexture( const char *name, texFlags_t flags )
{ {
gl_texture_t *tex; const qboolean skyboxhack = FBitSet( flags, TF_SKYSIDE ) && glConfig.context != CONTEXT_TYPE_GL_CORE;
uint i; gl_texture_t *tex = NULL;
GLuint texnum = 1;
// find a free texture_t slot if( !skyboxhack )
for( i = 0, tex = gl_textures; i < gl_numTextures; i++, tex++ )
if( !tex->name[0] ) break;
if( i == gl_numTextures )
{
if( gl_numTextures == MAX_TEXTURES )
gEngfuncs.Host_Error( "GL_AllocTexture: MAX_TEXTURES limit exceeds\n" );
gl_numTextures++;
}
tex = &gl_textures[i];
// copy initial params
Q_strncpy( tex->name, name, sizeof( tex->name ));
if( FBitSet( flags, TF_SKYSIDE ) && glConfig.context != CONTEXT_TYPE_GL_CORE )
tex->texnum = tr.skyboxbasenum++;
else
{ {
// keep generating new texture names to avoid collision with predefined skybox objects // keep generating new texture names to avoid collision with predefined skybox objects
do do
{ {
pglGenTextures( 1, &tex->texnum ); pglGenTextures( 1, &texnum );
} }
while( tex->texnum >= SKYBOX_BASE_NUM && while( texnum >= SKYBOX_BASE_NUM && texnum <= SKYBOX_BASE_NUM + SKYBOX_MAX_SIDES );
tex->texnum <= SKYBOX_BASE_NUM + SKYBOX_MAX_SIDES ); }
else texnum = tr.skyboxbasenum;
// try to match texture slot and texture handle because of buggy games
if( texnum >= MAX_TEXTURES || gl_textures[texnum].texnum != 0 )
{
// find a free texture_t slot
uint i;
for( i = 0; i < MAX_TEXTURES; i++ )
{
if( gl_textures[i].texnum )
continue;
tex = &gl_textures[i];
break;
}
}
else tex = &gl_textures[texnum];
if( tex == NULL )
{
gEngfuncs.Host_Error( "%s: MAX_TEXTURES limit exceeds\n", __func__ );
return NULL;
} }
// copy initial params
Q_strncpy( tex->name, name, sizeof( tex->name ));
tex->texnum = texnum;
tex->flags = flags; tex->flags = flags;
// increase counter
gl_numTextures = Q_max(( tex - gl_textures ) + 1, gl_numTextures );
if( skyboxhack )
tr.skyboxbasenum++;
// add to hash table // add to hash table
tex->hashValue = COM_HashKey( name, TEXTURES_HASH_SIZE ); tex->hashValue = COM_HashKey( name, TEXTURES_HASH_SIZE );
tex->nextHash = gl_texturesHashTable[tex->hashValue]; tex->nextHash = gl_texturesHashTable[tex->hashValue];