asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid double underscore from breaking glsl compiler, fixes #12880

Browse source
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) { static String _mkid(const String &p_id) {
StringBuffer<> id; String id = "m_" + p_id;
id += "m_"; return id.replace("__", "_dus_"); //doubleunderscore is reserverd in glsl
id += p_id;
return id.as_string();
} }
static String f2sp0(float p_float) { 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) { 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) { static String f2sp0(float p_float) {