godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid double underscore from breaking glsl compiler, fixes #12880

This commit is contained in:
Juan Linietsky 2018-11-10 10:48:18 -03:00
parent 3226b44f79
commit f00b522705
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gles2/shader_compiler_gles2.cpp
View File

@ -80,11 +80,8 @@ static String _opstr(SL::Operator p_op) {
static String _mkid(const String &p_id) {
StringBuffer<> id;
id += "m_";
id += p_id;
return id.as_string();
String id = "m_" + p_id;
return id.replace("__", "_dus_"); //doubleunderscore is reserverd in glsl
}
static String f2sp0(float p_float) {

3
drivers/gles3/shader_compiler_gles3.cpp
View File

@ -167,7 +167,8 @@ static String _opstr(SL::Operator p_op) {
static String _mkid(const String &p_id) {
return "m_" + p_id;
String id = "m_" + p_id;
return id.replace("__", "_dus_"); //doubleunderscore is reserverd in glsl
}
static String f2sp0(float p_float) {