mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2024-12-25 14:15:46 +00:00
Remove unnecessary exception handling. Hopefully fixes build on linux.
This commit is contained in:
parent
0d98efadc4
commit
8da8b5462b
4 changed files with 116 additions and 144 deletions
|
@ -3956,16 +3956,9 @@ void Core::clearResources()
|
|||
{
|
||||
deletedResources.push_back (resources[i]);
|
||||
Resource *r = resources[i];
|
||||
try
|
||||
{
|
||||
r->destroy();
|
||||
delete r;
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
errorLog("Resource could not be deleted " + resourceNames[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
resourceNames.clear();
|
||||
resources.clear();
|
||||
|
|
|
@ -45,10 +45,6 @@ public:
|
|||
ref--;
|
||||
if (ref == 0)
|
||||
destroy();
|
||||
/*
|
||||
else if (ref < 0)
|
||||
throw std::exception("ref count out of bounds < 0");
|
||||
*/
|
||||
}
|
||||
int getRef() { return ref; }
|
||||
std::string name;
|
||||
|
|
|
@ -260,9 +260,6 @@ void Shader::load(const std::string &file, const std::string &fragFile)
|
|||
g_location_mode = 0;
|
||||
g_location_value = 0;
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
debugLog("Shader::load 1");
|
||||
this->vertFile = file;
|
||||
this->fragFile = fragFile;
|
||||
|
@ -378,12 +375,7 @@ void Shader::load(const std::string &file, const std::string &fragFile)
|
|||
debugLog("Shader::load 7");
|
||||
|
||||
loaded = true;
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
debugLog("caught exception in shader::load");
|
||||
loaded = false;
|
||||
}
|
||||
|
||||
#endif
|
||||
debugLog("End Shader::load()");
|
||||
}
|
||||
|
|
|
@ -122,20 +122,11 @@ void StateData::eraseRenderObjects()
|
|||
for (int i = 0; i < renderObjects.size(); i++)
|
||||
{
|
||||
RenderObject *r = renderObjects[i];
|
||||
//try
|
||||
{
|
||||
if (r && !r->isDead())
|
||||
{
|
||||
core->enqueueRenderObjectDeletion(renderObjects[i]);
|
||||
}
|
||||
}
|
||||
/*
|
||||
catch(...)
|
||||
{
|
||||
debugLog("Caught exception in StateData::eraseRenderObjects");
|
||||
}
|
||||
*/
|
||||
}
|
||||
renderObjects.clear();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue