Skip to content

Commit

Permalink
Fix a inconsistency in R_LoadSkys between Renderer.dll and vanilla en…
Browse files Browse the repository at this point in the history
…gine.
  • Loading branch information
hzqst committed Mar 18, 2024
1 parent 67940cc commit 5accd00
Showing 1 changed file with 24 additions and 8 deletions.
32 changes: 24 additions & 8 deletions Plugins/Renderer/gl_rmain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3923,7 +3923,7 @@ void R_LoadSky_PreCall(const char* name)
#endif
}

void R_LoadLegacySkyTextures(const char* name)
bool R_LoadLegacySkyTextures(const char* name)
{
#if 0
auto skytexorder = (g_iEngineType == ENGINE_SVENGINE) ? skytexorder_svengine : skytexorder_goldsrc;
Expand All @@ -3935,6 +3935,7 @@ void R_LoadLegacySkyTextures(const char* name)
r_wsurf.vSkyboxTextureId[0 + i] = gSkyTexNumber[skytexorder[i]];
}
}
return true;
#else

const char* suf[6] = { "rt", "lf", "bk", "ft", "up", "dn" };
Expand All @@ -3960,16 +3961,17 @@ void R_LoadLegacySkyTextures(const char* name)
if (!bLoaded)
{
gEngfuncs.Con_DPrintf("R_LoadLegacySkyTextures: Failed to load %s\n", fullPath);
continue;

return false;
}

r_wsurf.vSkyboxTextureId[0 + i] = loadResult.gltexturenum;
}

return true;
#endif
}

void R_LoadDetailSkyTextures(const char* name)
bool R_LoadDetailSkyTextures(const char* name)
{
const char* suf[6] = { "rt", "lf", "bk", "ft", "up", "dn" };

Expand All @@ -3994,18 +3996,32 @@ void R_LoadDetailSkyTextures(const char* name)
if (!bLoaded)
{
gEngfuncs.Con_DPrintf("R_LoadDetailSkyTexture: Failed to load %s\n", fullPath);
continue;

return false;
}

r_wsurf.vSkyboxTextureId[6 + i] = loadResult.gltexturenum;
}

return true;
}

void R_LoadSky_PostCall(const char *name)
{
R_LoadLegacySkyTextures(name);

R_LoadDetailSkyTextures(name);
if (R_LoadLegacySkyTextures(name))
{
R_LoadDetailSkyTextures(name);
}
else
{
if (strcmp(name, "desert") != 0)
{
if (R_LoadLegacySkyTextures("desert"))
{
R_LoadDetailSkyTextures("desert");
}
}
}

R_CreateBindlessTexturesForSkybox();
}
Expand Down

0 comments on commit 5accd00

Please sign in to comment.