zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed error suppression code from shader compilation. 

With GL 2.x support the engine still had something to fall back on, with that removed it needs to abort.
This commit is contained in:
Christoph Oelckers 2014-06-23 09:26:29 +02:00
parent 1f0c69a0e9
commit e2e71e072e
1 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gl/shaders/gl_shader.cpp
View File

@ -249,14 +249,14 @@ FShader *FShaderManager::Compile (const char *ShaderName, const char *ShaderPath
shader = new FShader(ShaderName);
if (!shader->Load(ShaderName, "shaders/glsl/main.vp", "shaders/glsl/main.fp", ShaderPath, str))
{
I_Error("Unable to load shader %s\n", ShaderName);
I_FatalError("Unable to load shader %s\n", ShaderName);
}
}
catch(CRecoverableError &err)
{
if (shader != NULL) delete shader;
shader = NULL;
I_Error("Unable to load shader %s:\n%s\n", ShaderName, err.GetMessage());
I_FatalError("Unable to load shader %s:\n%s\n", ShaderName, err.GetMessage());
}
return shader;
}
@ -340,10 +340,9 @@ FShaderManager::~FShaderManager()
//==========================================================================
void FShaderManager::CompileShaders()
{
try
{
mActiveShader = mEffectShaders[0] = mEffectShaders[1] = NULL;
for(int i=0;defaultshaders[i].ShaderName != NULL;i++)
{
FShader *shc = Compile(defaultshaders[i].ShaderName, defaultshaders[i].gettexelfunc);
@ -370,15 +369,6 @@ void FShaderManager::CompileShaders()
else mEffectShaders[i] = eff;
}
}
catch (CRecoverableError &err)
{
// If shader compilation failed we can still run the fixed function mode so do that instead of aborting.
Printf("%s\n", err.GetMessage());
Printf(PRINT_HIGH, "Failed to compile shaders. Reverting to fixed function mode\n");
gl.glslversion = 0.0;
gl.flags &= ~RFL_BUFFER_STORAGE;
}
}
//==========================================================================
//
@ -458,6 +448,9 @@ void FShaderManager::SetWarpSpeed(unsigned int eff, float speed)
}
}
//==========================================================================
//
//
//
//==========================================================================