From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- .../blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl') diff --git a/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl index f6f0f5b83ec..cfa82572e87 100644 --- a/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl @@ -10,16 +10,15 @@ out vec4 fragColor; void main() { #if defined(USE_COLOR_U32) - fragColor = vec4( - ((color ) & uint(0xFF)) * (1.0f / 255.0f), - ((color >> 8) & uint(0xFF)) * (1.0f / 255.0f), - ((color >> 16) & uint(0xFF)) * (1.0f / 255.0f), - ((color >> 24) ) * (1.0f / 255.0f)); + fragColor = vec4(((color)&uint(0xFF)) * (1.0f / 255.0f), + ((color >> 8) & uint(0xFF)) * (1.0f / 255.0f), + ((color >> 16) & uint(0xFF)) * (1.0f / 255.0f), + ((color >> 24)) * (1.0f / 255.0f)); #else - fragColor = color; + fragColor = color; #endif #if defined(USE_BACKGROUND) - gl_FragDepth = 1.0; + gl_FragDepth = 1.0; #endif } -- cgit v1.2.3