godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Enables 'fma' for GLES2

Browse Source
This commit is contained in:
Yuri Roubinsky
2020-07-10 21:57:07 +03:00
parent 4d2e50eca6
commit 3eeb272b2e
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scene/resources/visual_shader_nodes.h
View File

@@ -2012,22 +2012,22 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual String get_caption() const; virtual String get_caption() const override;
virtual int get_input_port_count() const; virtual int get_input_port_count() const override;
virtual PortType get_input_port_type(int p_port) const; virtual PortType get_input_port_type(int p_port) const override;
virtual String get_input_port_name(int p_port) const; virtual String get_input_port_name(int p_port) const override;
virtual int get_output_port_count() const; virtual int get_output_port_count() const override;
virtual PortType get_output_port_type(int p_port) const; virtual PortType get_output_port_type(int p_port) const override;
virtual String get_output_port_name(int p_port) const; virtual String get_output_port_name(int p_port) const override;
virtual String generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview = false) const; //if no output is connected, the output var passed will be empty. if no input is connected and input is NIL, the input var passed will be empty virtual String generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview = false) const override; //if no output is connected, the output var passed will be empty. if no input is connected and input is NIL, the input var passed will be empty
void set_type(Type p_type); void set_type(Type p_type);
Type get_type() const; Type get_type() const;
virtual Vector<StringName> get_editable_properties() const; virtual Vector<StringName> get_editable_properties() const override;
VisualShaderNodeMultiplyAdd(); VisualShaderNodeMultiplyAdd();
}; };

8
servers/rendering/shader_language.cpp
View File

@@ -2137,10 +2137,10 @@ const ShaderLanguage::BuiltinFuncDef ShaderLanguage::builtin_func_defs[] = {
// modern functions // modern functions
{ "fma", TYPE_FLOAT, { TYPE_FLOAT, TYPE_FLOAT, TYPE_FLOAT, TYPE_VOID }, TAG_GLOBAL, true }, { "fma", TYPE_FLOAT, { TYPE_FLOAT, TYPE_FLOAT, TYPE_FLOAT, TYPE_VOID }, TAG_GLOBAL, false },
{ "fma", TYPE_VEC2, { TYPE_VEC2, TYPE_VEC2, TYPE_VEC2, TYPE_VOID }, TAG_GLOBAL, true }, { "fma", TYPE_VEC2, { TYPE_VEC2, TYPE_VEC2, TYPE_VEC2, TYPE_VOID }, TAG_GLOBAL, false },
{ "fma", TYPE_VEC3, { TYPE_VEC3, TYPE_VEC3, TYPE_VEC3, TYPE_VOID }, TAG_GLOBAL, true }, { "fma", TYPE_VEC3, { TYPE_VEC3, TYPE_VEC3, TYPE_VEC3, TYPE_VOID }, TAG_GLOBAL, false },
{ "fma", TYPE_VEC4, { TYPE_VEC4, TYPE_VEC4, TYPE_VEC4, TYPE_VOID }, TAG_GLOBAL, true }, { "fma", TYPE_VEC4, { TYPE_VEC4, TYPE_VEC4, TYPE_VEC4, TYPE_VOID }, TAG_GLOBAL, false },
{ nullptr, TYPE_VOID, { TYPE_VOID }, TAG_GLOBAL, false } { nullptr, TYPE_VOID, { TYPE_VOID }, TAG_GLOBAL, false }