diff options
| author | Yuri Rubinsky <chaosus89@gmail.com> | 2024-07-01 16:39:49 +0300 |
|---|---|---|
| committer | Chaosus <chaosus89@gmail.com> | 2024-09-09 15:12:11 +0300 |
| commit | af92fdb0ac1764bb58815d2fe7eb46bc4a1c50de (patch) | |
| tree | dbf8059b97e7cdffa45d6e9335ad5b9ed7e79374 /drivers | |
| parent | d0dc3896ad6fe039e4ad0607d901c81197cb3a3b (diff) | |
| download | redot-engine-af92fdb0ac1764bb58815d2fe7eb46bc4a1c50de.tar.gz | |
Add basic support to evaluate operator value in shader language
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/storage/material_storage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gles3/storage/material_storage.cpp b/drivers/gles3/storage/material_storage.cpp index a37eba3b15..7d5af48384 100644 --- a/drivers/gles3/storage/material_storage.cpp +++ b/drivers/gles3/storage/material_storage.cpp @@ -348,7 +348,7 @@ static void _fill_std140_variant_ubo_value(ShaderLanguage::DataType type, int p_ } } -_FORCE_INLINE_ static void _fill_std140_ubo_value(ShaderLanguage::DataType type, const Vector<ShaderLanguage::ConstantNode::Value> &value, uint8_t *data) { +_FORCE_INLINE_ static void _fill_std140_ubo_value(ShaderLanguage::DataType type, const Vector<ShaderLanguage::Scalar> &value, uint8_t *data) { switch (type) { case ShaderLanguage::TYPE_BOOL: { uint32_t *gui = (uint32_t *)data; @@ -572,7 +572,7 @@ void ShaderData::set_default_texture_parameter(const StringName &p_name, RID p_t Variant ShaderData::get_default_parameter(const StringName &p_parameter) const { if (uniforms.has(p_parameter)) { ShaderLanguage::ShaderNode::Uniform uniform = uniforms[p_parameter]; - Vector<ShaderLanguage::ConstantNode::Value> default_value = uniform.default_value; + Vector<ShaderLanguage::Scalar> default_value = uniform.default_value; return ShaderLanguage::constant_value_to_variant(default_value, uniform.type, uniform.array_size, uniform.hint); } return Variant(); |