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

Fix shader crash if using multiple underscores in identifier names 

(cherry picked from commit 15358b808b)
This commit is contained in:
Yuri Roubinsky 2020-01-31 09:11:17 +03:00 committed by Rémi Verschelde
parent 04cfcb3ba0
commit 786b1cc7ff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gles2/shader_compiler_gles2.cpp
View File

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

2
drivers/gles3/shader_compiler_gles3.cpp
View File

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