mirror of
https://github.com/love2d/love.git
synced 2026-08-17 19:23:38 +02:00
Severe case of premature commit-ion.
This commit is contained in:
@@ -156,7 +156,7 @@ void PixelEffect::unloadVolatile()
|
|||||||
std::string PixelEffect::getGLSLVersion()
|
std::string PixelEffect::getGLSLVersion()
|
||||||
{
|
{
|
||||||
// GL_SHADING_LANGUAGE_VERSION may not be available in OpenGL < 2.0.
|
// GL_SHADING_LANGUAGE_VERSION may not be available in OpenGL < 2.0.
|
||||||
const char *tmp = glGetString(GL_SHADING_LANGUAGE_VERSION);
|
const char *tmp = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
|
||||||
if (NULL == tmp)
|
if (NULL == tmp)
|
||||||
return "0.0";
|
return "0.0";
|
||||||
|
|
||||||
@@ -164,7 +164,7 @@ std::string PixelEffect::getGLSLVersion()
|
|||||||
// major_number.minor_number
|
// major_number.minor_number
|
||||||
// or
|
// or
|
||||||
// major_number.minor_number.release_number
|
// major_number.minor_number.release_number
|
||||||
std::string versionString((const char *)glGetString(GL_SHADING_LANGUAGE_VERSION));
|
std::string versionString(tmp);
|
||||||
size_t minorEndPos = versionString.find(" ");
|
size_t minorEndPos = versionString.find(" ");
|
||||||
return versionString.substr(0, minorEndPos);
|
return versionString.substr(0, minorEndPos);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user