diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-31 08:13:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 08:13:04 +0100 |
| commit | fbba94fb01e5842ef1e9827ef8b8da393d9c966b (patch) | |
| tree | 150460ab45bac480a4a09d7bc071f27e926e97ca | |
| parent | 3c3ed67c3944a555d18fa8b68603f3a68416e27e (diff) | |
| parent | 15358b808be0cf6ab20ff2d2e23b82fa9a2cf30d (diff) | |
Merge pull request #35769 from Chaosus/shader_fix_crash
Fix shader crash if using multiple underscores in identifier names
| -rw-r--r-- | drivers/gles2/shader_compiler_gles2.cpp | 2 | ||||
| -rw-r--r-- | drivers/gles3/shader_compiler_gles3.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp index 24b89aedc2..5dec6f2fee 100644 --- a/drivers/gles2/shader_compiler_gles2.cpp +++ b/drivers/gles2/shader_compiler_gles2.cpp @@ -80,7 +80,7 @@ static String _opstr(SL::Operator p_op) { 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 } diff --git a/drivers/gles3/shader_compiler_gles3.cpp b/drivers/gles3/shader_compiler_gles3.cpp index f43943bdff..4e4d896bd7 100644 --- a/drivers/gles3/shader_compiler_gles3.cpp +++ b/drivers/gles3/shader_compiler_gles3.cpp @@ -166,7 +166,7 @@ static String _opstr(SL::Operator p_op) { 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 } |