FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Technique selection: fix shader-language

Browse Source 
(Also add a glsl-supported test to simplify Effect logic)
This commit is contained in:
James Turner 2014-01-16 20:09:21 +00:00
parent c35243e215
commit 481f7e3bfa
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
simgear/scene/material/Technique.cxx
View File

@ -250,11 +250,7 @@ class GLVersionExpression : public SGExpression<float>
public:
void eval(float& value, const expression::Binding*) const
{
#ifdef TECHNIQUE_TEST_EXTENSIONS
value = 1.1;
#else
value = getGLVersionNumber();
#endif
}
};
@ -335,9 +331,37 @@ Expression* shaderLanguageParser(const SGPropertyNode* exp,
}
expression::ExpParserRegistrar shaderLanguageRegistrar("shader-language",
glVersionParser);
shaderLanguageParser);
class GLSLSupportedExpression : public GeneralNaryExpression<bool, int>
{
public:
void eval(bool& value, const expression::Binding* b) const
{
value = false;
int contextId = getOperand(0)->getValue(b);
GL2Extensions* extensions
= GL2Extensions::Get(static_cast<unsigned>(contextId), true);
if (!extensions)
return;
value = extensions->isGlslSupported();
}
};
Expression* glslSupportedParser(const SGPropertyNode* exp,
expression::Parser* parser)
{
GLSLSupportedExpression* sexp = new GLSLSupportedExpression;
int location = parser->getBindingLayout().addBinding("__contextId",
expression::INT);
VariableExpression<int>* contextExp = new VariableExpression<int>(location);
sexp->addOperand(contextExp);
return sexp;
}
expression::ExpParserRegistrar glslSupportedRegistrar("glsl-supported",
glslSupportedParser);
void Technique::setGLExtensionsPred(float glVersion,
const std::vector<std::string>& extensions)
{