Skip to content

Commit 9f42d1c

Browse files
committed
Merge pull request godotengine#100678 from clayjohn/label3d-msdf
Fix shader compilation errors when using MSDF fonts with Label3D nodes
2 parents f7d6924 + ed83e5e commit 9f42d1c

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

scene/resources/material.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -932,12 +932,10 @@ uniform float msdf_outline_size : hint_range(0.0, 250.0, 1.0);
932932
// If alpha antialiasing isn't off, add in the edge variable.
933933
if (alpha_antialiasing_mode != ALPHA_ANTIALIASING_OFF &&
934934
(transparency == TRANSPARENCY_ALPHA_SCISSOR || transparency == TRANSPARENCY_ALPHA_HASH)) {
935-
code += R"(
936-
uniform float alpha_antialiasing_edge : hint_range(0.0, 1.0, 0.01);
937-
uniform ivec2 albedo_texture_size;
938-
)";
935+
code += "uniform float alpha_antialiasing_edge : hint_range(0.0, 1.0, 0.01);\n";
939936
}
940937

938+
code += "uniform ivec2 albedo_texture_size;\n";
941939
code += "uniform float point_size : hint_range(0.1, 128.0, 0.1);\n";
942940

943941
if (!orm) {
@@ -1515,7 +1513,7 @@ void fragment() {)";
15151513
vec3(1.0 + 0.055) * pow(albedo_tex.rgb, vec3(1.0 / 2.4)) - vec3(0.055),
15161514
vec3(12.92) * albedo_tex.rgb,
15171515
lessThan(albedo_tex.rgb, vec3(0.0031308)));
1518-
vec2 msdf_size = vec2(msdf_pixel_range) / vec2(albedo_texture_size));
1516+
vec2 msdf_size = vec2(msdf_pixel_range) / vec2(albedo_texture_size);
15191517
)";
15201518
if (flags[FLAG_USE_POINT_SIZE]) {
15211519
code += " vec2 dest_size = vec2(1.0) / fwidth(POINT_COORD);\n";

0 commit comments

Comments
 (0)