1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/gles3/shader_compiler_gles3.cpp b/drivers/gles3/shader_compiler_gles3.cpp
index 945970c6b4..070c661c8a 100644
--- a/drivers/gles3/shader_compiler_gles3.cpp
+++ b/drivers/gles3/shader_compiler_gles3.cpp
@@ -71,9 +71,9 @@ static int _get_datatype_size(SL::DataType p_type) {
 		case SL::TYPE_VEC3: return 12;
 		case SL::TYPE_VEC4: return 16;
 		case SL::TYPE_MAT2:
-			return 24; //4 * 4 + 4 * 2
+			return 32; //4 * 4 + 4 * 4
 		case SL::TYPE_MAT3:
-			return 44; // 4 * 4 + 4 * 4 + 4 * 3
+			return 48; // 4 * 4 + 4 * 4 + 4 * 4
 		case SL::TYPE_MAT4: return 64;
 		case SL::TYPE_SAMPLER2D: return 16;
 		case SL::TYPE_ISAMPLER2D: return 16;
@@ -477,22 +477,22 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener
 
 				current_func_name = fnode->name;
 
-				if (fnode->name == "vertex") {
+				if (fnode->name == vertex_name) {
 
 					_dump_function_deps(pnode, fnode->name, function_code, r_gen_code.vertex_global, added_vtx);
-					r_gen_code.vertex = function_code["vertex"];
+					r_gen_code.vertex = function_code[vertex_name];
 				}
 
-				if (fnode->name == "fragment") {
+				if (fnode->name == fragment_name) {
 
 					_dump_function_deps(pnode, fnode->name, function_code, r_gen_code.fragment_global, added_fragment);
-					r_gen_code.fragment = function_code["fragment"];
+					r_gen_code.fragment = function_code[fragment_name];
 				}
 
-				if (fnode->name == "light") {
+				if (fnode->name == light_name) {
 
 					_dump_function_deps(pnode, fnode->name, function_code, r_gen_code.fragment_global, added_fragment);
-					r_gen_code.light = function_code["light"];
+					r_gen_code.light = function_code[light_name];
 				}
 			}
 
@@ -573,7 +573,7 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener
 				if (current_func_name == vertex_name) {
 					r_gen_code.uses_vertex_time = true;
 				}
-				if (current_func_name == fragment_name) {
+				if (current_func_name == fragment_name || current_func_name == light_name) {
 					r_gen_code.uses_fragment_time = true;
 				}
 			}
@@ -939,6 +939,7 @@ ShaderCompilerGLES3::ShaderCompilerGLES3() {
 
 	vertex_name = "vertex";
 	fragment_name = "fragment";
+	light_name = "light";
 	time_name = "TIME";
 
 	List<String> func_list;