diff options
| author | QbieShay <cislaghi.ilaria@gmail.com> | 2024-05-01 11:12:31 +0200 |
|---|---|---|
| committer | QbieShay <cislaghi.ilaria@gmail.com> | 2024-05-01 22:24:49 +0200 |
| commit | e41064388e67cc9bec320ee467757089b150bf20 (patch) | |
| tree | 154c5a2a6e055c5ab29ecf2f22e0122cfdc5eedc /drivers | |
| parent | 26738ea20dc5d80be0eba6bb83af73fb996759d6 (diff) | |
| download | redot-engine-e41064388e67cc9bec320ee467757089b150bf20.tar.gz | |
reverted naming to premul alpha (no T)
Initially 3d had premulT alpha as a keyword.
Since Canvas item uses mixed premul and premult as keywords,
3D is changed as well to keep consistency with 2D.
Unfortunately this keeps inconsistency with the internal ENUM.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/shaders/scene.glsl | 12 | ||||
| -rw-r--r-- | drivers/gles3/storage/material_storage.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl index 22d72337b9..0c6a048af6 100644 --- a/drivers/gles3/shaders/scene.glsl +++ b/drivers/gles3/shaders/scene.glsl @@ -1442,9 +1442,9 @@ void main() { float clearcoat_roughness = 0.0; float anisotropy = 0.0; vec2 anisotropy_flow = vec2(1.0, 0.0); -#ifdef PREMULT_ALPHA_USED - float premult_alpha = 1.0; -#endif +#ifdef PREMUL_ALPHA_USED + float premul_alpha = 1.0; +#endif PREMUL_ALPHA_USED #ifndef FOG_DISABLED vec4 fog = vec4(0.0); #endif // !FOG_DISABLED @@ -2149,7 +2149,7 @@ void main() { #endif // !RENDER_MATERIAL #endif // !MODE_RENDER_DEPTH -#ifdef PREMULT_ALPHA_USED - frag_color.rgb *= premult_alpha; -#endif +#ifdef PREMUL_ALPHA_USED + frag_color.rgb *= premul_alpha; +#endif PREMUL_ALPHA_USED } diff --git a/drivers/gles3/storage/material_storage.cpp b/drivers/gles3/storage/material_storage.cpp index 1952502fb2..9f1b3d3a04 100644 --- a/drivers/gles3/storage/material_storage.cpp +++ b/drivers/gles3/storage/material_storage.cpp @@ -1243,7 +1243,7 @@ MaterialStorage::MaterialStorage() { actions.renames["NORMAL_MAP_DEPTH"] = "normal_map_depth"; actions.renames["ALBEDO"] = "albedo"; actions.renames["ALPHA"] = "alpha"; - actions.renames["PREMULT_ALPHA_FACTOR"] = "premult_alpha"; + actions.renames["PREMUL_ALPHA_FACTOR"] = "premul_alpha"; actions.renames["METALLIC"] = "metallic"; actions.renames["SPECULAR"] = "specular"; actions.renames["ROUGHNESS"] = "roughness"; @@ -2910,7 +2910,7 @@ void SceneShaderData::set_code(const String &p_code) { actions.render_mode_values["blend_mix"] = Pair<int *, int>(&blend_modei, BLEND_MODE_MIX); actions.render_mode_values["blend_sub"] = Pair<int *, int>(&blend_modei, BLEND_MODE_SUB); actions.render_mode_values["blend_mul"] = Pair<int *, int>(&blend_modei, BLEND_MODE_MUL); - actions.render_mode_values["blend_premult_alpha"] = Pair<int *, int>(&blend_modei, BLEND_MODE_PREMULT_ALPHA); + actions.render_mode_values["blend_premul_alpha"] = Pair<int *, int>(&blend_modei, BLEND_MODE_PREMULT_ALPHA); actions.render_mode_values["alpha_to_coverage"] = Pair<int *, int>(&alpha_antialiasing_modei, ALPHA_ANTIALIASING_ALPHA_TO_COVERAGE); actions.render_mode_values["alpha_to_coverage_and_one"] = Pair<int *, int>(&alpha_antialiasing_modei, ALPHA_ANTIALIASING_ALPHA_TO_COVERAGE_AND_TO_ONE); |