Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix macos openggl compile process_ARB_shading_language_packing type conversion error (#6994)

Browse Source
This commit is contained in:
Mirsfang
2023-07-27 09:34:41 -07:00
committed by GitHub
parent b35e24daa7
commit e3568cd89f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filament/backend/src/opengl/ShaderCompilerService.cpp
+6 -6
View File
@@ -661,8 +661,8 @@ float u16tofp32(highp uint v) {
v <<= 16u;
highp uint s = v & 0x80000000u;
highp uint n = v & 0x7FFFFFFFu;
highp uint nz = n == 0u ? 0u : 0xFFFFFFFF;
return uintBitsToFloat(s | ((((n >> 3u) + (0x70u << 23))) & nz));
highp uint nz = (n == 0u) ? 0u : 0xFFFFFFFFu;
return uintBitsToFloat(s | ((((n >> 3u) + (0x70u << 23u))) & nz));
}
vec2 unpackHalf2x16(highp uint v) {
return vec2(u16tofp32(v&0xFFFFu), u16tofp32(v>>16u));
@@ -670,11 +670,11 @@ vec2 unpackHalf2x16(highp uint v) {
uint fp32tou16(float val) {
uint f32 = floatBitsToUint(val);
uint f16 = 0u;
uint sign = (f32 >> 16) & 0x8000u;
int exponent = int((f32 >> 23) & 0xFFu) - 127;
uint sign = (f32 >> 16u) & 0x8000u;
int exponent = int((f32 >> 23u) & 0xFFu) - 127;
uint mantissa = f32 & 0x007FFFFFu;
if (exponent > 15) {
f16 = sign | (0x1Fu << 10);
f16 = sign | (0x1Fu << 10u);
} else if (exponent > -15) {
exponent += 15;
mantissa >>= 13;
@@ -687,7 +687,7 @@ uint fp32tou16(float val) {
highp uint packHalf2x16(vec2 v) {
highp uint x = fp32tou16(v.x);
highp uint y = fp32tou16(v.y);
return (y << 16) | x;
return (y << 16u) | x;
}
)"sv;
}