Skip to content

S
swiftshader
Commit c236b576 by Alexis Hetu Committed by Alexis Hétu
Options

Removed a few parentheses for slightly better clang formatting

Bug: b/144825072 Change-Id: If620d4ce920dad1d929c8e1ad3ea87d8de8f9b1e Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/40030Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarAlexis Hétu <sugoi@google.com>
parent b8a61bfc
Showing with 5 additions and 5 deletions
src/Pipeline/SamplerCore.cpp
...@@ -1719,7 +1719,7 @@ Vector4s SamplerCore::sampleTexel(UInt index[4], Pointer<Byte> buffer) ...@@ -1719,7 +1719,7 @@ Vector4s SamplerCore::sampleTexel(UInt index[4], Pointer<Byte> buffer)
cc = Insert(cc, Pointer<Int>(buffer)[index[2]], 2); cc = Insert(cc, Pointer<Int>(buffer)[index[2]], 2);
cc = Insert(cc, Pointer<Int>(buffer)[index[3]], 3); cc = Insert(cc, Pointer<Int>(buffer)[index[3]], 3);
c.x = Short4(((cc)&Int4(0x3FF))); c.x = Short4((cc & Int4(0x3FF)));
c.y = Short4(((cc >> 10) & Int4(0x3FF))); c.y = Short4(((cc >> 10) & Int4(0x3FF)));
c.z = Short4(((cc >> 20) & Int4(0x3FF))); c.z = Short4(((cc >> 20) & Int4(0x3FF)));
c.w = Short4(((cc >> 30) & Int4(0x3))); c.w = Short4(((cc >> 30) & Int4(0x3)));
...@@ -1732,7 +1732,7 @@ Vector4s SamplerCore::sampleTexel(UInt index[4], Pointer<Byte> buffer) ...@@ -1732,7 +1732,7 @@ Vector4s SamplerCore::sampleTexel(UInt index[4], Pointer<Byte> buffer)
cc = Insert(cc, Pointer<Int>(buffer)[index[2]], 2); cc = Insert(cc, Pointer<Int>(buffer)[index[2]], 2);
cc = Insert(cc, Pointer<Int>(buffer)[index[3]], 3); cc = Insert(cc, Pointer<Int>(buffer)[index[3]], 3);
c.z = Short4(((cc)&Int4(0x3FF))); c.z = Short4((cc & Int4(0x3FF)));
c.y = Short4(((cc >> 10) & Int4(0x3FF))); c.y = Short4(((cc >> 10) & Int4(0x3FF)));
c.x = Short4(((cc >> 20) & Int4(0x3FF))); c.x = Short4(((cc >> 20) & Int4(0x3FF)));
c.w = Short4(((cc >> 30) & Int4(0x3))); c.w = Short4(((cc >> 30) & Int4(0x3)));
...@@ -2012,7 +2012,7 @@ Vector4f SamplerCore::sampleTexel(Int4 &uuuu, Int4 &vvvv, Int4 &wwww, Float4 &z, ...@@ -2012,7 +2012,7 @@ Vector4f SamplerCore::sampleTexel(Int4 &uuuu, Int4 &vvvv, Int4 &wwww, Float4 &z,
t.w = *Pointer<Float>(buffer + index[3] * 4); t.w = *Pointer<Float>(buffer + index[3] * 4);
t0 = As<UInt4>(t); t0 = As<UInt4>(t);
c.w = Float4(UInt4(1) << ((t0 >> 27) & UInt4(0x1F))) * Float4(1.0f / (1 << 24)); c.w = Float4(UInt4(1) << ((t0 >> 27) & UInt4(0x1F))) * Float4(1.0f / (1 << 24));
c.x = Float4((t0)&UInt4(0x1FF)) * c.w; c.x = Float4(t0 & UInt4(0x1FF)) * c.w;
c.y = Float4((t0 >> 9) & UInt4(0x1FF)) * c.w; c.y = Float4((t0 >> 9) & UInt4(0x1FF)) * c.w;
c.z = Float4((t0 >> 18) & UInt4(0x1FF)) * c.w; c.z = Float4((t0 >> 18) & UInt4(0x1FF)) * c.w;
break; break;
......
src/Pipeline/ShaderCore.cpp
...@@ -734,7 +734,7 @@ rr::RValue<sw::SIMD::Float> NMin(rr::RValue<sw::SIMD::Float> const &x, rr::RValu ...@@ -734,7 +734,7 @@ rr::RValue<sw::SIMD::Float> NMin(rr::RValue<sw::SIMD::Float> const &x, rr::RValu
// If one operand is a NaN, the other operand is the result // If one operand is a NaN, the other operand is the result
// If both operands are NaN, the result is a NaN. // If both operands are NaN, the result is a NaN.
((~xIsNan & yIsNan) & As<sw::SIMD::Int>(x)) | ((~xIsNan & yIsNan) & As<sw::SIMD::Int>(x)) |
((xIsNan)&As<sw::SIMD::Int>(y))); (xIsNan & As<sw::SIMD::Int>(y)));
} }
// Returns y if y > x; otherwise result is x. // Returns y if y > x; otherwise result is x.
...@@ -751,7 +751,7 @@ rr::RValue<sw::SIMD::Float> NMax(rr::RValue<sw::SIMD::Float> const &x, rr::RValu ...@@ -751,7 +751,7 @@ rr::RValue<sw::SIMD::Float> NMax(rr::RValue<sw::SIMD::Float> const &x, rr::RValu
// If one operand is a NaN, the other operand is the result // If one operand is a NaN, the other operand is the result
// If both operands are NaN, the result is a NaN. // If both operands are NaN, the result is a NaN.
((~xIsNan & yIsNan) & As<sw::SIMD::Int>(x)) | ((~xIsNan & yIsNan) & As<sw::SIMD::Int>(x)) |
((xIsNan)&As<sw::SIMD::Int>(y))); (xIsNan & As<sw::SIMD::Int>(y)));
} }
// Returns the determinant of a 2x2 matrix. // Returns the determinant of a 2x2 matrix.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment