diff options
| author | Yuri Roubinsky <chaosus89@gmail.com> | 2021-10-04 19:16:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 19:16:19 +0300 |
| commit | 87e7f793e4852a6fda6a338b8abd0c5cda38ac25 (patch) | |
| tree | 71017b13f1a773124d79027308f3235c6d74105f /servers/rendering/shader_language.h | |
| parent | 073db835692f0bef9e09a98ccd322f1c3c54acd4 (diff) | |
| parent | 6873ecaaf9b2c5ad35487b1ff1d4be17770d7aab (diff) | |
Merge pull request #49485 from Chaosus/shader_uniform_arrays
Diffstat (limited to 'servers/rendering/shader_language.h')
| -rw-r--r-- | servers/rendering/shader_language.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/servers/rendering/shader_language.h b/servers/rendering/shader_language.h index 18525e054e..7908658028 100644 --- a/servers/rendering/shader_language.h +++ b/servers/rendering/shader_language.h @@ -692,8 +692,10 @@ public: int order = 0; int texture_order = 0; + int texture_binding = 0; DataType type = TYPE_VOID; DataPrecision precision = PRECISION_DEFAULT; + int array_size = 0; Vector<ConstantNode::Value> default_value; Scope scope = SCOPE_LOCAL; Hint hint = HINT_NONE; @@ -776,7 +778,7 @@ public: static bool is_scalar_type(DataType p_type); static bool is_float_type(DataType p_type); static bool is_sampler_type(DataType p_type); - static Variant constant_value_to_variant(const Vector<ShaderLanguage::ConstantNode::Value> &p_value, DataType p_type, ShaderLanguage::ShaderNode::Uniform::Hint p_hint = ShaderLanguage::ShaderNode::Uniform::HINT_NONE); + static Variant constant_value_to_variant(const Vector<ShaderLanguage::ConstantNode::Value> &p_value, DataType p_type, int p_array_size, ShaderLanguage::ShaderNode::Uniform::Hint p_hint = ShaderLanguage::ShaderNode::Uniform::HINT_NONE); static PropertyInfo uniform_to_property_info(const ShaderNode::Uniform &p_uniform); static uint32_t get_type_size(DataType p_type); |