birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/RenderDll/XRenderD3D9/D3DShaders.cpp
-2
View File
@@ -955,7 +955,6 @@ SHWActivatedShader::~SHWActivatedShader()
}
bool CShaderMan::mfReleasePreactivatedShaderData()
{
bool bRes = true;
FXCompressedShadersItor it;
std::vector<CCryNameTSCRC> DelStuff;
for (it = CHWShader::m_CompressedShaders.begin(); it != CHWShader::m_CompressedShaders.end(); ++it)
@@ -992,7 +991,6 @@ bool CShaderMan::mfPreactivateShaders2(
bool bLoaded = LevelLookup.LoadData((pathPerLevel + "lookupdata.bin").c_str(), CParserBin::m_bEndians, true);
if (bLoaded)
{
const AZStd::string& pathGlobal = gRenDev->m_cEF.m_ShadersCache;
const char* cgcShaders = "cgcshaders";
const char* cgdShaders = "cgdshaders";