diff options
| author | Yuri Rubinsky <chaosus89@gmail.com> | 2022-08-01 15:04:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-01 15:04:54 +0300 |
| commit | 9ec6de1767292b5cbc1ebdc7b262ef1d9c63df9a (patch) | |
| tree | a43c3ce0e6a9a2d373791a38df87618e185001d4 | |
| parent | d29e95687e60409235c2b53915cc42d7ab60834c (diff) | |
| parent | 81c44718caa570d33e9339f23b809754a322b509 (diff) | |
| download | redot-engine-9ec6de1767292b5cbc1ebdc7b262ef1d9c63df9a.tar.gz | |
Merge pull request #63766 from Chaosus/fix_shader_instance_uniform
| -rw-r--r-- | drivers/gles3/storage/material_storage.cpp | 3 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/storage_rd/material_storage.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gles3/storage/material_storage.cpp b/drivers/gles3/storage/material_storage.cpp index 68045930b0..ac2f4f0019 100644 --- a/drivers/gles3/storage/material_storage.cpp +++ b/drivers/gles3/storage/material_storage.cpp @@ -2320,11 +2320,14 @@ void MaterialStorage::global_shader_uniforms_instance_update(RID p_instance, int ShaderLanguage::TYPE_VEC3, // vec3 ShaderLanguage::TYPE_IVEC3, //vec3i ShaderLanguage::TYPE_MAX, //xform2d not supported here + ShaderLanguage::TYPE_VEC4, //vec4 + ShaderLanguage::TYPE_IVEC4, //vec4i ShaderLanguage::TYPE_VEC4, //plane ShaderLanguage::TYPE_VEC4, //quat ShaderLanguage::TYPE_MAX, //aabb not supported here ShaderLanguage::TYPE_MAX, //basis not supported here ShaderLanguage::TYPE_MAX, //xform not supported here + ShaderLanguage::TYPE_MAX, //projection not supported here ShaderLanguage::TYPE_VEC4 //color }; diff --git a/servers/rendering/renderer_rd/storage_rd/material_storage.cpp b/servers/rendering/renderer_rd/storage_rd/material_storage.cpp index 296dd1a157..8297e72260 100644 --- a/servers/rendering/renderer_rd/storage_rd/material_storage.cpp +++ b/servers/rendering/renderer_rd/storage_rd/material_storage.cpp @@ -2209,11 +2209,14 @@ void MaterialStorage::global_shader_uniforms_instance_update(RID p_instance, int ShaderLanguage::TYPE_VEC3, // vec3 ShaderLanguage::TYPE_IVEC3, //vec3i ShaderLanguage::TYPE_MAX, //xform2d not supported here + ShaderLanguage::TYPE_VEC4, //vec4 + ShaderLanguage::TYPE_IVEC4, //vec4i ShaderLanguage::TYPE_VEC4, //plane ShaderLanguage::TYPE_VEC4, //quat ShaderLanguage::TYPE_MAX, //aabb not supported here ShaderLanguage::TYPE_MAX, //basis not supported here ShaderLanguage::TYPE_MAX, //xform not supported here + ShaderLanguage::TYPE_MAX, //projection not supported here ShaderLanguage::TYPE_VEC4 //color }; |