Re-added "pixeleffect" graphics isSupported string for compatibility

This commit is contained in:
Alexander Szpakowski
2012-12-31 06:18:43 -04:00
parent d62878fbb8
commit 15a1fd3552
4 changed files with 26 additions and 13 deletions
+1
View File
@@ -158,6 +158,7 @@ StringMap<Graphics::Support, Graphics::SUPPORT_MAX_ENUM>::Entry Graphics::suppor
{ "canvas", Graphics::SUPPORT_CANVAS },
{ "hdrcanvas", Graphics::SUPPORT_HDR_CANVAS },
{ "shadereffect", Graphics::SUPPORT_SHADEREFFECT },
{ "pixeleffect", Graphics::SUPPORT_SHADEREFFECT }, // for compatibility
{ "npot", Graphics::SUPPORT_NPOT },
{ "subtractive", Graphics::SUPPORT_SUBTRACTIVE },
};
+1 -2
View File
@@ -167,7 +167,7 @@ void ShaderEffect::createProgram(const std::vector<GLuint> &shaderids)
glLinkProgram(_program);
for (it = shaderids.begin(); it != shaderids.end(); ++it)
glDeleteShader(*it); // flag shaders for deletion as soon as program object is deleted
glDeleteShader(*it); // flag shaders for auto-deletion when program object is deleted
GLint link_ok;
glGetProgramiv(_program, GL_LINK_STATUS, &link_ok);
@@ -251,7 +251,6 @@ std::string ShaderEffect::getGLSLVersion()
return versionString.substr(0, minorEndPos);
}
bool ShaderEffect::isSupported()
{
return GLEE_VERSION_2_0 && getGLSLVersion() >= "1.2";