[Bf-blender-cvs] [3bc87227f51] master: GPUMaterial: Cleanup / optimization

Clément Foucault noreply at git.blender.org
Fri Jan 11 16:00:36 CET 2019


Commit: 3bc87227f51548e0c781f5747bd2c8a66bb9cea3
Author: Clément Foucault
Date:   Sun Dec 23 00:07:52 2018 +0100
Branches: master
https://developer.blender.org/rB3bc87227f51548e0c781f5747bd2c8a66bb9cea3

GPUMaterial: Cleanup / optimization

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

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 6c7c8f24f51..c86efdef7a8 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -856,12 +856,9 @@ void hue_sat(float hue, float sat, float value, float fac, vec4 col, out vec4 ou
 
 	rgb_to_hsv(col, hsv);
 
-	hsv[0] += (hue - 0.5);
-	if (hsv[0] > 1.0) hsv[0] -= 1.0; else if (hsv[0] < 0.0) hsv[0] += 1.0;
-	hsv[1] *= sat;
-	if (hsv[1] > 1.0) hsv[1] = 1.0; else if (hsv[1] < 0.0) hsv[1] = 0.0;
-	hsv[2] *= value;
-	if (hsv[2] > 1.0) hsv[2] = 1.0; else if (hsv[2] < 0.0) hsv[2] = 0.0;
+	hsv[0] = fract(hsv[0] + (hue - 0.5));
+	hsv[1] = clamp(hsv[1] * sat, 0.0, 1.0);
+	hsv[2] = clamp(hsv[2] * value, 0.0, 1.0);
 
 	hsv_to_rgb(hsv, outcol);



More information about the Bf-blender-cvs mailing list