summaryrefslogtreecommitdiff
path: root/servers
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-01-31 10:03:12 +0100
committerGitHub <noreply@github.com>2020-02-11 12:16:33 +0100
commiteb2b1a602247b88b0710a5eaae0146e0afeed265 (patch)
treeadf38040ee8692e62caa69d3c23378110ab269e6 /servers
parent2049dec79e0293f98d4c3f972f3a660ea5758983 (diff)
parent21e3cc7bb87b1a78380cd62c5a4679cccb644ef7 (diff)
Merge pull request #35773 from Chaosus/vk_shader_fix_crash
[Vulkan] Fix shader crash if using multiple underscores in identifiers
Diffstat (limited to 'servers')
-rw-r--r--servers/visual/rasterizer_rd/shader_compiler_rd.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/visual/rasterizer_rd/shader_compiler_rd.cpp b/servers/visual/rasterizer_rd/shader_compiler_rd.cpp
index ee0a1abe41..c702cc5138 100644
--- a/servers/visual/rasterizer_rd/shader_compiler_rd.cpp
+++ b/servers/visual/rasterizer_rd/shader_compiler_rd.cpp
@@ -170,7 +170,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
}