Commit: 65a069b5393279eb64db8e3e5bff97a5a8ef755a Author: Miguel Pozo Date: Fri Oct 7 16:06:04 2022 +0200 Branches: tmp-workbench-rewrite2 https://developer.blender.org/rB65a069b5393279eb64db8e3e5bff97a5a8ef755a
Revert "Fix workbench_float_pair encode/decode" This reverts commit 79f15f68c5cd2c8229e203d0f9472281d3464a3e. =================================================================== M source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl =================================================================== diff --git a/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl index e59d9352bd3..9b142fe56b5 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl @@ -41,7 +41,7 @@ float workbench_float_pair_encode(float v1, float v2) const int v2_mask = 0x7; int iv1 = int(v1 * float(v1_mask)); int iv2 = int(v2 * float(v2_mask)) << int(ROUGHNESS_BITS); - return float(iv1 | iv2) / 255.0; + return float(iv1 | iv2); } void workbench_float_pair_decode(float data, out float v1, out float v2) @@ -51,7 +51,7 @@ void workbench_float_pair_decode(float data, out float v1, out float v2) /* Same as above because some compiler are very dumb and think we use medium int. */ const int v1_mask = 0x1F; const int v2_mask = 0x7; - int idata = int(data * 255.0); + int idata = int(data); v1 = float(idata & v1_mask) * (1.0 / float(v1_mask)); v2 = float(idata >> int(ROUGHNESS_BITS)) * (1.0 / float(v2_mask)); } _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
