Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2022-03-22 15:44:15 +0300
committerJacques Lucke <jacques@blender.org>2022-03-22 15:44:15 +0300
commit2ebcb7fab3e237b7d00de3088c34780cd24f397b (patch)
treef348f5701a8e30ef9c2dcaa1628c5ac184ec4aa0 /source/blender/gpu/shaders
parent19c793af35ea8e694c16995d115d7c9247fee81a (diff)
Cleanup: make format and fix warning
Diffstat (limited to 'source/blender/gpu/shaders')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_text_vert.glsl5
-rw-r--r--source/blender/gpu/shaders/material/gpu_shader_material_light_falloff.glsl7
3 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl
index aa182eb52be..d77f073b7de 100644
--- a/source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl
@@ -34,7 +34,7 @@ void main()
{
fragColor = texture(image_texture, texCoord_interp.xy);
vec4 overlay_col = texture(overlays_texture, texCoord_interp.xy);
-
+
if (overlay) {
fragColor = clamp(fragColor, 0.0, 1.0);
fragColor *= 1.0 - overlay_col.a;
diff --git a/source/blender/gpu/shaders/gpu_shader_text_vert.glsl b/source/blender/gpu/shaders/gpu_shader_text_vert.glsl
index 4221e426a3e..63d73733c2f 100644
--- a/source/blender/gpu/shaders/gpu_shader_text_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_text_vert.glsl
@@ -28,8 +28,9 @@ void main()
vec2 interp_offset = float(interp_size) / abs(pos.zw - pos.xy);
texCoord_interp = mix(-interp_offset, 1.0 + interp_offset, quad);
- vec2 final_pos = mix(
- vec2(ivec2(pos.xy) + ivec2(-interp_size, interp_size)), vec2(ivec2(pos.zw) + ivec2(interp_size, -interp_size)), quad);
+ vec2 final_pos = mix(vec2(ivec2(pos.xy) + ivec2(-interp_size, interp_size)),
+ vec2(ivec2(pos.zw) + ivec2(interp_size, -interp_size)),
+ quad);
gl_Position = ModelViewProjectionMatrix * vec4(final_pos, 0.0, 1.0);
}
diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_light_falloff.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_light_falloff.glsl
index e1c7a00646f..92762db5ff4 100644
--- a/source/blender/gpu/shaders/material/gpu_shader_material_light_falloff.glsl
+++ b/source/blender/gpu/shaders/material/gpu_shader_material_light_falloff.glsl
@@ -1,5 +1,8 @@
-void node_light_falloff(
- float strength, float tsmooth, out float quadratic, out float linear, out float falloff_constant)
+void node_light_falloff(float strength,
+ float tsmooth,
+ out float quadratic,
+ out float linear,
+ out float falloff_constant)
{
quadratic = strength;
linear = strength;