MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Use std::to_string for GL version numbers in shaders headers.

Browse Source 
std::stringstream can't take number as input on Linux for unknown reason.

This is GLideN64 problem, plain test application from http://www.cplusplus.com
works correct.
This commit is contained in:
Sergey Lipskiy 2017-01-27 22:39:25 +07:00
parent 50c0c38b63
commit 1d2aa4b96e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp
View File

@ -197,13 +197,13 @@ public:
}
else if (_glinfo.isGLESX) {
std::stringstream ss;
ss << "#version " << _glinfo.majorVersion << _glinfo.minorVersion << "0 es " << std::endl;
ss << "#version " << std::to_string(_glinfo.majorVersion) << std::to_string(_glinfo.minorVersion) << "0 es " << std::endl;
ss << "# define IN in" << std::endl << "# define OUT out" << std::endl;
m_part = ss.str();
}
else {
std::stringstream ss;
ss << "#version " << _glinfo.majorVersion << _glinfo.minorVersion << "0 core " << std::endl;
ss << "#version " << std::to_string(_glinfo.majorVersion) << std::to_string(_glinfo.minorVersion) << "0 core " << std::endl;
ss << "# define IN in" << std::endl << "# define OUT out" << std::endl;
m_part = ss.str();
}
@ -423,14 +423,14 @@ public:
}
else if (_glinfo.isGLESX) {
std::stringstream ss;
ss << "#version " << _glinfo.majorVersion << _glinfo.minorVersion << "0 es " << std::endl;
ss << "#version " << std::to_string(_glinfo.majorVersion) << std::to_string(_glinfo.minorVersion) << "0 es " << std::endl;
ss << "# define IN in" << std::endl
<< "# define OUT out" << std::endl
<< "# define texture2D texture" << std::endl;
m_part = ss.str();
} else {
std::stringstream ss;
ss << "#version " << _glinfo.majorVersion << _glinfo.minorVersion << "0 core " << std::endl;
ss << "#version " << std::to_string(_glinfo.majorVersion) << std::to_string(_glinfo.minorVersion) << "0 core " << std::endl;
ss << "# define IN in" << std::endl
<< "# define OUT out" << std::endl
<< "# define texture2D texture" << std::endl;