aboutsummaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/glsl/float64.glsl36
1 files changed, 14 insertions, 22 deletions
diff --git a/src/compiler/glsl/float64.glsl b/src/compiler/glsl/float64.glsl
index 0433d925a39..5f201c8f725 100644
--- a/src/compiler/glsl/float64.glsl
+++ b/src/compiler/glsl/float64.glsl
@@ -1299,43 +1299,35 @@ __fp64_to_fp32(uint64_t __a)
float
__uint64_to_fp32(uint64_t __a)
{
- uint zFrac = 0u;
uvec2 aFrac = unpackUint2x32(__a);
- int shiftCount = __countLeadingZeros32(mix(aFrac.y, aFrac.x, aFrac.y == 0u));
- shiftCount -= mix(40, 8, aFrac.y == 0u);
+ int shiftCount = mix(__countLeadingZeros32(aFrac.y) - 33,
+ __countLeadingZeros32(aFrac.x) - 1,
+ aFrac.y == 0u);
- if (0 <= shiftCount) {
+ if (0 <= shiftCount)
__shortShift64Left(aFrac.y, aFrac.x, shiftCount, aFrac.y, aFrac.x);
- bool is_zero = (aFrac.y | aFrac.x) == 0u;
- return mix(__packFloat32(0u, 0x95 - shiftCount, aFrac.x), 0, is_zero);
- }
+ else
+ __shift64RightJamming(aFrac.y, aFrac.x, -shiftCount, aFrac.y, aFrac.x);
- shiftCount += 7;
- __shift64RightJamming(aFrac.y, aFrac.x, -shiftCount, aFrac.y, aFrac.x);
- zFrac = mix(aFrac.x<<shiftCount, aFrac.x, shiftCount < 0);
- return __roundAndPackFloat32(0u, 0x9C - shiftCount, zFrac);
+ return __roundAndPackFloat32(0u, 0x9C - shiftCount, aFrac.x);
}
float
__int64_to_fp32(int64_t __a)
{
- uint zFrac = 0u;
uint aSign = uint(__a < 0);
uint64_t absA = mix(uint64_t(__a), uint64_t(-__a), __a < 0);
uvec2 aFrac = unpackUint2x32(absA);
- int shiftCount = __countLeadingZeros32(mix(aFrac.y, aFrac.x, aFrac.y == 0u));
- shiftCount -= mix(40, 8, aFrac.y == 0u);
+ int shiftCount = mix(__countLeadingZeros32(aFrac.y) - 33,
+ __countLeadingZeros32(aFrac.x) - 1,
+ aFrac.y == 0u);
- if (0 <= shiftCount) {
+ if (0 <= shiftCount)
__shortShift64Left(aFrac.y, aFrac.x, shiftCount, aFrac.y, aFrac.x);
- bool is_zero = (aFrac.y | aFrac.x) == 0u;
- return mix(__packFloat32(aSign, 0x95 - shiftCount, aFrac.x), 0, absA == 0u);
- }
+ else
+ __shift64RightJamming(aFrac.y, aFrac.x, -shiftCount, aFrac.y, aFrac.x);
- shiftCount += 7;
- __shift64RightJamming(aFrac.y, aFrac.x, -shiftCount, aFrac.y, aFrac.x);
- zFrac = mix(aFrac.x<<shiftCount, aFrac.x, shiftCount < 0);
- return __roundAndPackFloat32(aSign, 0x9C - shiftCount, zFrac);
+ return __roundAndPackFloat32(aSign, 0x9C - shiftCount, aFrac.x);
}
/* Returns the result of converting the single-precision floating-point value