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

Fix the update logic for user-added custom defines.

Browse Source 
The previous logic was causing the (unintentional) removal of custom defines automatically added by the engine.
This commit is contained in:
Fredia Huya-Kouadio
2020-09-06 21:31:09 -07:00
parent 13e2e487a2
commit 0af5cded1e
13 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
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) {
VS::get_singleton()->shader_clear_custom_defines(shader);
VS::get_singleton()->shader_add_custom_define(shader, p_defines);
}
String Shader::get_custom_defines() {
Vector<String> 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];
if (shader_custom_defines == p_defines) {
return;
}
return concatenated_defines;
if (!shader_custom_defines.empty()) {
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() const {
return shader_custom_defines;
}
bool Shader::is_text_shader() const {

3
scene/resources/shader.h
View File

@ -53,6 +53,7 @@ public:
private:
RID shader;
Mode mode;
String shader_custom_defines;
// hack the name of performance
// 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 set_custom_defines(const String &p_defines);
String get_custom_defines();
String get_custom_defines() const;
virtual bool is_text_shader() const;