diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2024-05-01 23:47:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 23:47:46 +0200 |
| commit | f91db3dc58f1d6a0cb63d591515183b5a45cd3ba (patch) | |
| tree | 3c0f467d5178d325986f3f36cb9af2fc6d06e7b4 /servers/rendering/shader_types.cpp | |
| parent | 92e726d8dc27d9f9b377224d6fa776b0d42ca5c2 (diff) | |
| parent | e41064388e67cc9bec320ee467757089b150bf20 (diff) | |
| download | redot-engine-f91db3dc58f1d6a0cb63d591515183b5a45cd3ba.tar.gz | |
Merge pull request #91399 from QbieShay/qbe/fix-pmul-name
Revert premul alpha to spell without the T
Diffstat (limited to 'servers/rendering/shader_types.cpp')
| -rw-r--r-- | servers/rendering/shader_types.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/shader_types.cpp b/servers/rendering/shader_types.cpp index a363055a99..b2fa0ea9d2 100644 --- a/servers/rendering/shader_types.cpp +++ b/servers/rendering/shader_types.cpp @@ -124,7 +124,7 @@ ShaderTypes::ShaderTypes() { shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["UV2"] = constt(ShaderLanguage::TYPE_VEC2); shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["COLOR"] = constt(ShaderLanguage::TYPE_VEC4); shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ALBEDO"] = ShaderLanguage::TYPE_VEC3; - shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["PREMULT_ALPHA_FACTOR"] = ShaderLanguage::TYPE_FLOAT; + shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["PREMUL_ALPHA_FACTOR"] = ShaderLanguage::TYPE_FLOAT; shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["ALPHA"] = ShaderLanguage::TYPE_FLOAT; shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["METALLIC"] = ShaderLanguage::TYPE_FLOAT; shader_modes[RS::SHADER_SPATIAL].functions["fragment"].built_ins["SPECULAR"] = ShaderLanguage::TYPE_FLOAT; @@ -209,7 +209,7 @@ ShaderTypes::ShaderTypes() { // spatial render modes { - shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("blend"), "mix", "add", "sub", "mul", "premult_alpha" }); + shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("blend"), "mix", "add", "sub", "mul", "premul_alpha" }); shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("depth_draw"), "opaque", "always", "never" }); shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("depth_prepass_alpha") }); shader_modes[RS::SHADER_SPATIAL].modes.push_back({ PNAME("depth_test_disabled") }); |