|
|
@ -131,7 +131,11 @@ namespace Shader
|
|
|
|
{
|
|
|
|
{
|
|
|
|
std::string shaderSource = templateIt->second;
|
|
|
|
std::string shaderSource = templateIt->second;
|
|
|
|
if (!parseDefines(shaderSource, defines))
|
|
|
|
if (!parseDefines(shaderSource, defines))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
// Add to the cache anyway to avoid logging the same error over and over.
|
|
|
|
|
|
|
|
mShaders.insert(std::make_pair(std::make_pair(shaderTemplate, defines), nullptr));
|
|
|
|
return NULL;
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
osg::ref_ptr<osg::Shader> shader (new osg::Shader(shaderType));
|
|
|
|
osg::ref_ptr<osg::Shader> shader (new osg::Shader(shaderType));
|
|
|
|
shader->setShaderSource(shaderSource);
|
|
|
|
shader->setShaderSource(shaderSource);
|
|
|
|