[Bf-blender-cvs] [c599aeaee57] blender2.8: GPU: Cleanup / Opti : Vectorize + MADD and remove unused function

[Clément Foucault]

Commit: c599aeaee577611f8faa1c537642ff23a87d2190
Author: Clément Foucault
Date:   Sat Nov 17 14:55:53 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBc599aeaee577611f8faa1c537642ff23a87d2190

GPU: Cleanup / Opti : Vectorize + MADD and remove unused function

===================================================================

M	source/blender/gpu/shaders/gpu_shader_material.glsl

===================================================================

diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index ae6ea7eefa2..0d54f7fa69d 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -141,26 +141,16 @@ void linearrgb_to_srgb(vec4 col_from, out vec4 col_to)
 	col_to.a = col_from.a;
 }
 
-void color_to_normal(vec3 color, out vec3 normal)
-{
-	normal.x =  2.0 * ((color.r) - 0.5);
-	normal.y = -2.0 * ((color.g) - 0.5);
-	normal.z =  2.0 * ((color.b) - 0.5);
-}
-
 void color_to_normal_new_shading(vec3 color, out vec3 normal)
 {
-	normal.x =  2.0 * ((color.r) - 0.5);
-	normal.y =  2.0 * ((color.g) - 0.5);
-	normal.z =  2.0 * ((color.b) - 0.5);
+	normal = vec3(2.0) * color - vec3(1.0);
 }
 
 void color_to_blender_normal_new_shading(vec3 color, out vec3 normal)
 {
-	normal.x =  2.0 * ((color.r) - 0.5);
-	normal.y = -2.0 * ((color.g) - 0.5);
-	normal.z = -2.0 * ((color.b) - 0.5);
+	normal = vec3(2.0, -2.0, -2.0) * color - vec3(1.0);
 }
+
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif