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

Merge pull request #41837 from m4gr3d/fix_custom_defines_update_logic 

Fix the update logic for user-added custom defines.
This commit is contained in:
Rémi Verschelde 2020-09-07 08:29:29 +02:00 committed by GitHub
parent 13e2e487a2 0af5cded1e
commit 784e854e58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dummy/rasterizer_dummy.h
View File

@ -264,7 +264,7 @@ public:
void shader_add_custom_define(RID p_shader, const String &p_define) {} void shader_add_custom_define(RID p_shader, const String &p_define) {}
void shader_get_custom_defines(RID p_shader, Vector<String> *p_defines) const {} void shader_get_custom_defines(RID p_shader, Vector<String> *p_defines) const {}
void shader_clear_custom_defines(RID p_shader) {} void shader_remove_custom_define(RID p_shader, const String &p_define) {}
/* COMMON MATERIAL API */ /* COMMON MATERIAL API */

4
drivers/gles2/rasterizer_storage_gles2.cpp
View File

@ -1753,12 +1753,12 @@ void RasterizerStorageGLES2::shader_get_custom_defines(RID p_shader, Vector<Stri
shader->shader->get_custom_defines(p_defines); shader->shader->get_custom_defines(p_defines);
} }
void RasterizerStorageGLES2::shader_clear_custom_defines(RID p_shader) { void RasterizerStorageGLES2::shader_remove_custom_define(RID p_shader, const String &p_define) {
Shader *shader = shader_owner.get(p_shader); Shader *shader = shader_owner.get(p_shader);
ERR_FAIL_COND(!shader); ERR_FAIL_COND(!shader);
shader->shader->clear_custom_defines(); shader->shader->remove_custom_define(p_define);
_shader_make_dirty(shader); _shader_make_dirty(shader);
} }

2
drivers/gles2/rasterizer_storage_gles2.h
View File

@ -543,7 +543,7 @@ public:
virtual void shader_add_custom_define(RID p_shader, const String &p_define); virtual void shader_add_custom_define(RID p_shader, const String &p_define);
virtual void shader_get_custom_defines(RID p_shader, Vector<String> *p_defines) const; virtual void shader_get_custom_defines(RID p_shader, Vector<String> *p_defines) const;
virtual void shader_clear_custom_defines(RID p_shader); virtual void shader_remove_custom_define(RID p_shader, const String &p_define);
void _update_shader(Shader *p_shader) const; void _update_shader(Shader *p_shader) const;
void update_dirty_shaders(); void update_dirty_shaders();

4
drivers/gles2/shader_gles2.h
View File

@ -252,8 +252,8 @@ public:
} }
} }
void clear_custom_defines() { void remove_custom_define(const String &p_define) {
custom_defines.clear(); custom_defines.erase(p_define.utf8());
} }
virtual ~ShaderGLES2(); virtual ~ShaderGLES2();

4
drivers/gles3/rasterizer_storage_gles3.cpp
View File

@ -2584,12 +2584,12 @@ void RasterizerStorageGLES3::shader_get_custom_defines(RID p_shader, Vector<Stri
shader->shader->get_custom_defines(p_defines); shader->shader->get_custom_defines(p_defines);
} }
void RasterizerStorageGLES3::shader_clear_custom_defines(RID p_shader) { void RasterizerStorageGLES3::shader_remove_custom_define(RID p_shader, const String &p_define) {
Shader *shader = shader_owner.get(p_shader); Shader *shader = shader_owner.get(p_shader);
ERR_FAIL_COND(!shader); ERR_FAIL_COND(!shader);
shader->shader->clear_custom_defines(); shader->shader->remove_custom_define(p_define);
_shader_make_dirty(shader); _shader_make_dirty(shader);
} }

2
drivers/gles3/rasterizer_storage_gles3.h
View File

@ -539,7 +539,7 @@ public:
virtual void shader_add_custom_define(RID p_shader, const String &p_define); virtual void shader_add_custom_define(RID p_shader, const String &p_define);
virtual void shader_get_custom_defines(RID p_shader, Vector<String> *p_defines) const; virtual void shader_get_custom_defines(RID p_shader, Vector<String> *p_defines) const;
virtual void shader_clear_custom_defines(RID p_shader); virtual void shader_remove_custom_define(RID p_shader, const String &p_define);
void _update_shader(Shader *p_shader) const; void _update_shader(Shader *p_shader) const;

4
drivers/gles3/shader_gles3.h
View File

@ -374,8 +374,8 @@ public:
} }
} }
void clear_custom_defines() { void remove_custom_define(const String &p_define) {
custom_defines.clear(); custom_defines.erase(p_define.utf8());
} }
virtual ~ShaderGLES3(); virtual ~ShaderGLES3();

26
scene/resources/shader.cpp
View File

@ -128,24 +128,20 @@ void Shader::get_default_texture_param_list(List<StringName> *r_textures) const
} }
void Shader::set_custom_defines(const String &p_defines) { void Shader::set_custom_defines(const String &p_defines) {
if (shader_custom_defines == p_defines) {
return;
}
VS::get_singleton()->shader_clear_custom_defines(shader); if (!shader_custom_defines.empty()) {
VS::get_singleton()->shader_add_custom_define(shader, p_defines); VS::get_singleton()->shader_remove_custom_define(shader, shader_custom_defines);
}
shader_custom_defines = p_defines;
VS::get_singleton()->shader_add_custom_define(shader, shader_custom_defines);
} }
String Shader::get_custom_defines() { String Shader::get_custom_defines() const {
Vector<String> custom_defines; return shader_custom_defines;
VS::get_singleton()->shader_get_custom_defines(shader, &custom_defines);
String concatenated_defines;
for (int i = 0; i < custom_defines.size(); i++) {
if (i != 0) {
concatenated_defines += "\n";
}
concatenated_defines += custom_defines[i];
}
return concatenated_defines;
} }
bool Shader::is_text_shader() const { bool Shader::is_text_shader() const {

3
scene/resources/shader.h
View File

@ -53,6 +53,7 @@ public:
private: private:
RID shader; RID shader;
Mode mode; Mode mode;
String shader_custom_defines;
// hack the name of performance // hack the name of performance
// shaders keep a list of ShaderMaterial -> VisualServer name translations, to make // shaders keep a list of ShaderMaterial -> VisualServer name translations, to make
@ -80,7 +81,7 @@ public:
void get_default_texture_param_list(List<StringName> *r_textures) const; void get_default_texture_param_list(List<StringName> *r_textures) const;
void set_custom_defines(const String &p_defines); void set_custom_defines(const String &p_defines);
String get_custom_defines(); String get_custom_defines() const;
virtual bool is_text_shader() const; virtual bool is_text_shader() const;

2
servers/visual/rasterizer.h
View File

@ -244,7 +244,7 @@ public:
virtual void shader_add_custom_define(RID p_shader, const String &p_define) = 0; virtual void shader_add_custom_define(RID p_shader, const String &p_define) = 0;
virtual void shader_get_custom_defines(RID p_shader, Vector<String> *p_defines) const = 0; virtual void shader_get_custom_defines(RID p_shader, Vector<String> *p_defines) const = 0;
virtual void shader_clear_custom_defines(RID p_shader) = 0; virtual void shader_remove_custom_define(RID p_shader, const String &p_define) = 0;
/* COMMON MATERIAL API */ /* COMMON MATERIAL API */

2
servers/visual/visual_server_raster.h
View File

@ -192,7 +192,7 @@ public:
BIND2(shader_add_custom_define, RID, const String &) BIND2(shader_add_custom_define, RID, const String &)
BIND2C(shader_get_custom_defines, RID, Vector<String> *) BIND2C(shader_get_custom_defines, RID, Vector<String> *)
BIND1(shader_clear_custom_defines, RID) BIND2(shader_remove_custom_define, RID, const String &)
/* COMMON MATERIAL API */ /* COMMON MATERIAL API */

2
servers/visual/visual_server_wrap_mt.h
View File

@ -128,7 +128,7 @@ public:
FUNC2(shader_add_custom_define, RID, const String &) FUNC2(shader_add_custom_define, RID, const String &)
FUNC2SC(shader_get_custom_defines, RID, Vector<String> *) FUNC2SC(shader_get_custom_defines, RID, Vector<String> *)
FUNC1(shader_clear_custom_defines, RID) FUNC2(shader_remove_custom_define, RID, const String &)
/* COMMON MATERIAL API */ /* COMMON MATERIAL API */

2
servers/visual_server.h
View File

@ -197,7 +197,7 @@ public:
virtual void shader_add_custom_define(RID p_shader, const String &p_define) = 0; virtual void shader_add_custom_define(RID p_shader, const String &p_define) = 0;
virtual void shader_get_custom_defines(RID p_shader, Vector<String> *p_defines) const = 0; virtual void shader_get_custom_defines(RID p_shader, Vector<String> *p_defines) const = 0;
virtual void shader_clear_custom_defines(RID p_shader) = 0; virtual void shader_remove_custom_define(RID p_shader, const String &p_define) = 0;
/* COMMON MATERIAL API */ /* COMMON MATERIAL API */