From 4c56edfb832686257e58f4ce5012b512934359e0 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 20 Feb 2018 07:28:22 -0300 Subject: [PATCH] Revert "Handle single-argument constructors in uniform default values" --- servers/visual/shader_language.cpp | 54 ------------------------------ 1 file changed, 54 deletions(-) diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index e67d83aaa18..d9f2c949e9b 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -3138,60 +3138,6 @@ ShaderLanguage::Node *ShaderLanguage::_reduce_expression(BlockNode *p_block, Sha } } - // Passed a single argument - if (op->arguments.size() <= 2) { - if (op->get_datatype() < TYPE_MAT2) { - // Scalar or vector - int dimensions = 0; - switch (op->get_datatype()) { - case TYPE_VEC2: - case TYPE_BVEC2: - case TYPE_UVEC2: - case TYPE_IVEC2: { - dimensions = 2; - } break; - case TYPE_VEC3: - case TYPE_BVEC3: - case TYPE_UVEC3: - case TYPE_IVEC3: { - dimensions = 3; - } break; - case TYPE_VEC4: - case TYPE_BVEC4: - case TYPE_UVEC4: - case TYPE_IVEC4: { - dimensions = 4; - } break; - } - - if (dimensions) { - ConstantNode::Value val = values[0]; - for (int i = 1; i < dimensions; i++) { - - values.push_back(val); - } - } - } else if (op->get_datatype() <= TYPE_MAT4) { - // Matrix - int dimensions = 0; - switch (op->get_datatype()) { - case TYPE_MAT2: dimensions = 2; break; - case TYPE_MAT3: dimensions = 3; break; - case TYPE_MAT4: dimensions = 4; break; - } - - // Fill the diagonal with the value, the rest with zeroes - ConstantNode::Value val = values[0]; - for (int i = 1; i < dimensions * dimensions; i++) { - if (i % (dimensions + 1) == 0) { - values.push_back(val); - } else { - values.push_back(ConstantNode::Value()); - } - } - } - } - ConstantNode *cn = alloc_node(); cn->datatype = op->get_datatype(); cn->values = values;