Skip to content

S
swiftshader
Commit 8b5f3ef5 by Alexis Hetu Committed by Alexis Hétu
Options

New builtin function implementations

A few new OpenGLES3.0 builtin function are implemented here: - sinh, cosh, tanh, arcsinh, arccosh, arctanh - floatBitsToInt, floatBitsToUInt, intBitsToFloat, uintBitsToFloat - round Change-Id: Ic0edcd80dff2bdded6cd6dccf1e5d4df64c5d8ba Reviewed-on: https://swiftshader-review.googlesource.com/2862Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 2205c201
Showing with 279 additions and 0 deletions
src/Shader/ShaderCore.cpp
...@@ -64,6 +64,92 @@ namespace sw ...@@ -64,6 +64,92 @@ namespace sw
return x; return x;
} }
Vector4i::Vector4i()
{
}
Vector4i::Vector4i(int x, int y, int z, int w)
{
this->x = Int4(x);
this->y = Int4(y);
this->z = Int4(z);
this->w = Int4(w);
}
Vector4i::Vector4i(const Vector4i &rhs)
{
x = rhs.x;
y = rhs.y;
z = rhs.z;
w = rhs.w;
}
Vector4i &Vector4i::operator=(const Vector4i &rhs)
{
x = rhs.x;
y = rhs.y;
z = rhs.z;
w = rhs.w;
return *this;
}
Int4 &Vector4i::operator[](int i)
{
switch(i)
{
case 0: return x;
case 1: return y;
case 2: return z;
case 3: return w;
}
return x;
}
Vector4u::Vector4u()
{
}
Vector4u::Vector4u(unsigned int x, unsigned int y, unsigned int z, unsigned int w)
{
this->x = UInt4(x);
this->y = UInt4(y);
this->z = UInt4(z);
this->w = UInt4(w);
}
Vector4u::Vector4u(const Vector4u &rhs)
{
x = rhs.x;
y = rhs.y;
z = rhs.z;
w = rhs.w;
}
Vector4u &Vector4u::operator=(const Vector4u &rhs)
{
x = rhs.x;
y = rhs.y;
z = rhs.z;
w = rhs.w;
return *this;
}
UInt4 &Vector4u::operator[](int i)
{
switch(i)
{
case 0: return x;
case 1: return y;
case 2: return z;
case 3: return w;
}
return x;
}
Vector4f::Vector4f() Vector4f::Vector4f()
{ {
} }
...@@ -366,6 +452,58 @@ namespace sw ...@@ -366,6 +452,58 @@ namespace sw
return theta; return theta;
} }
Float4 sineh(RValue<Float4> x, bool pp)
{
return (exponential(x, pp) - exponential(-x, pp)) * Float4(0.5f);
}
Float4 cosineh(RValue<Float4> x, bool pp)
{
return (exponential(x, pp) + exponential(-x, pp)) * Float4(0.5f);
}
Float4 tangenth(RValue<Float4> x, bool pp)
{
Float4 e_x = exponential(x, pp);
Float4 e_minus_x = exponential(-x, pp);
return (e_x - e_minus_x) / (e_x + e_minus_x);
}
Float4 arccosh(RValue<Float4> x, bool pp)
{
return logarithm(x + Sqrt(x + Float4(1.0f)) * Sqrt(x - Float4(1.0f)), pp);
}
Float4 arcsinh(RValue<Float4> x, bool pp)
{
return logarithm(x + Sqrt(x * x + Float4(1.0f)), pp);
}
Float4 arctanh(RValue<Float4> x, bool pp)
{
return logarithm((Float4(1.0f) + x) / (Float4(1.0f) - x), pp) * Float4(0.5f);
}
Int4 floatBitsToInt(RValue<Float4> x)
{
return As<Int4>(x);
}
UInt4 floatBitsToUInt(RValue<Float4> x)
{
return As<UInt4>(x);
}
Float4 intBitsToFloat(RValue<Int4> x)
{
return As<Float4>(x);
}
Float4 uintBitsToFloat(RValue<UInt4> x)
{
return As<Float4>(x);
}
Float4 dot2(Vector4f &v0, Vector4f &v1) Float4 dot2(Vector4f &v0, Vector4f &v1)
{ {
return v0.x * v1.x + v0.y * v1.y; return v0.x * v1.x + v0.y * v1.y;
...@@ -799,6 +937,38 @@ namespace sw ...@@ -799,6 +937,38 @@ namespace sw
Float4 tw = Min(Max((x.w - edge0.w) / (edge1.w - edge0.w), Float4(0.0f)), Float4(1.0f)); dst.w = tw * tw * (Float4(3.0f) - Float4(2.0f) * tw); Float4 tw = Min(Max((x.w - edge0.w) / (edge1.w - edge0.w), Float4(0.0f)), Float4(1.0f)); dst.w = tw * tw * (Float4(3.0f) - Float4(2.0f) * tw);
} }
void ShaderCore::floatBitsToInt(Vector4i &dst, Vector4f &src)
{
dst.x = sw::floatBitsToInt(src.x);
dst.y = sw::floatBitsToInt(src.y);
dst.z = sw::floatBitsToInt(src.z);
dst.w = sw::floatBitsToInt(src.w);
}
void ShaderCore::floatBitsToUInt(Vector4u &dst, Vector4f &src)
{
dst.x = sw::floatBitsToUInt(src.x);
dst.y = sw::floatBitsToUInt(src.y);
dst.z = sw::floatBitsToUInt(src.z);
dst.w = sw::floatBitsToUInt(src.w);
}
void ShaderCore::intBitsToFloat(Vector4f &dst, Vector4i &src)
{
dst.x = sw::intBitsToFloat(src.x);
dst.y = sw::intBitsToFloat(src.y);
dst.z = sw::intBitsToFloat(src.z);
dst.w = sw::intBitsToFloat(src.w);
}
void ShaderCore::uintBitsToFloat(Vector4f &dst, Vector4u &src)
{
dst.x = sw::uintBitsToFloat(src.x);
dst.y = sw::uintBitsToFloat(src.y);
dst.z = sw::uintBitsToFloat(src.z);
dst.w = sw::uintBitsToFloat(src.w);
}
void ShaderCore::frc(Vector4f &dst, Vector4f &src) void ShaderCore::frc(Vector4f &dst, Vector4f &src)
{ {
dst.x = Frac(src.x); dst.x = Frac(src.x);
...@@ -823,6 +993,14 @@ namespace sw ...@@ -823,6 +993,14 @@ namespace sw
dst.w = Floor(src.w); dst.w = Floor(src.w);
} }
void ShaderCore::round(Vector4f &dst, Vector4f &src)
{
dst.x = Round(src.x);
dst.y = Round(src.y);
dst.z = Round(src.z);
dst.w = Round(src.w);
}
void ShaderCore::ceil(Vector4f &dst, Vector4f &src) void ShaderCore::ceil(Vector4f &dst, Vector4f &src)
{ {
dst.x = Ceil(src.x); dst.x = Ceil(src.x);
...@@ -1081,6 +1259,54 @@ namespace sw ...@@ -1081,6 +1259,54 @@ namespace sw
dst.w = arctan(src0.w, src1.w, pp); dst.w = arctan(src0.w, src1.w, pp);
} }
void ShaderCore::cosh(Vector4f &dst, Vector4f &src, bool pp)
{
dst.x = cosineh(src.x, pp);
dst.y = cosineh(src.y, pp);
dst.z = cosineh(src.z, pp);
dst.w = cosineh(src.w, pp);
}
void ShaderCore::sinh(Vector4f &dst, Vector4f &src, bool pp)
{
dst.x = sineh(src.x, pp);
dst.y = sineh(src.y, pp);
dst.z = sineh(src.z, pp);
dst.w = sineh(src.w, pp);
}
void ShaderCore::tanh(Vector4f &dst, Vector4f &src, bool pp)
{
dst.x = tangenth(src.x, pp);
dst.y = tangenth(src.y, pp);
dst.z = tangenth(src.z, pp);
dst.w = tangenth(src.w, pp);
}
void ShaderCore::acosh(Vector4f &dst, Vector4f &src, bool pp)
{
dst.x = arccosh(src.x, pp);
dst.y = arccosh(src.y, pp);
dst.z = arccosh(src.z, pp);
dst.w = arccosh(src.w, pp);
}
void ShaderCore::asinh(Vector4f &dst, Vector4f &src, bool pp)
{
dst.x = arcsinh(src.x, pp);
dst.y = arcsinh(src.y, pp);
dst.z = arcsinh(src.z, pp);
dst.w = arcsinh(src.w, pp);
}
void ShaderCore::atanh(Vector4f &dst, Vector4f &src, bool pp)
{
dst.x = arctanh(src.x, pp);
dst.y = arctanh(src.y, pp);
dst.z = arctanh(src.z, pp);
dst.w = arctanh(src.w, pp);
}
void ShaderCore::expp(Vector4f &dst, Vector4f &src, unsigned short version) void ShaderCore::expp(Vector4f &dst, Vector4f &src, unsigned short version)
{ {
if(version < 0x0200) if(version < 0x0200)
......
src/Shader/ShaderCore.hpp
...@@ -34,6 +34,38 @@ namespace sw ...@@ -34,6 +34,38 @@ namespace sw
Short4 w; Short4 w;
}; };
class Vector4i
{
public:
Vector4i();
Vector4i(int x, int y, int z, int w);
Vector4i(const Vector4i &rhs);
Int4 &operator[](int i);
Vector4i &operator=(const Vector4i &rhs);
Int4 x;
Int4 y;
Int4 z;
Int4 w;
};
class Vector4u
{
public:
Vector4u();
Vector4u(unsigned int x, unsigned int y, unsigned int z, unsigned int w);
Vector4u(const Vector4u &rhs);
UInt4 &operator[](int i);
Vector4u &operator=(const Vector4u &rhs);
UInt4 x;
UInt4 y;
UInt4 z;
UInt4 w;
};
class Vector4f class Vector4f
{ {
public: public:
...@@ -67,6 +99,16 @@ namespace sw ...@@ -67,6 +99,16 @@ namespace sw
Float4 arcsin(RValue<Float4> x, bool pp = false); Float4 arcsin(RValue<Float4> x, bool pp = false);
Float4 arctan(RValue<Float4> x, bool pp = false); Float4 arctan(RValue<Float4> x, bool pp = false);
Float4 arctan(RValue<Float4> y, RValue<Float4> x, bool pp = false); Float4 arctan(RValue<Float4> y, RValue<Float4> x, bool pp = false);
Float4 sineh(RValue<Float4> x, bool pp = false);
Float4 cosineh(RValue<Float4> x, bool pp = false);
Float4 tangenth(RValue<Float4> x, bool pp = false);
Float4 arccosh(RValue<Float4> x, bool pp = false); // Limited to x >= 1
Float4 arcsinh(RValue<Float4> x, bool pp = false);
Float4 arctanh(RValue<Float4> x, bool pp = false); // Limited to ]-1, 1[ range
Int4 floatBitsToInt(RValue<Float4> x);
UInt4 floatBitsToUInt(RValue<Float4> x);
Float4 intBitsToFloat(RValue<Int4> x);
Float4 uintBitsToFloat(RValue<UInt4> x);
Float4 dot2(Vector4f &v0, Vector4f &v1); Float4 dot2(Vector4f &v0, Vector4f &v1);
Float4 dot3(Vector4f &v0, Vector4f &v1); Float4 dot3(Vector4f &v0, Vector4f &v1);
...@@ -239,9 +281,14 @@ namespace sw ...@@ -239,9 +281,14 @@ namespace sw
void att(Vector4f &dst, Vector4f &src0, Vector4f &src1); void att(Vector4f &dst, Vector4f &src0, Vector4f &src1);
void lrp(Vector4f &dst, Vector4f &src0, Vector4f &src1, Vector4f &src2); void lrp(Vector4f &dst, Vector4f &src0, Vector4f &src1, Vector4f &src2);
void smooth(Vector4f &dst, Vector4f &src0, Vector4f &src1, Vector4f &src2); void smooth(Vector4f &dst, Vector4f &src0, Vector4f &src1, Vector4f &src2);
void floatBitsToInt(Vector4i &dst, Vector4f &src);
void floatBitsToUInt(Vector4u &dst, Vector4f &src);
void intBitsToFloat(Vector4f &dst, Vector4i &src);
void uintBitsToFloat(Vector4f &dst, Vector4u &src);
void frc(Vector4f &dst, Vector4f &src); void frc(Vector4f &dst, Vector4f &src);
void trunc(Vector4f &dst, Vector4f &src); void trunc(Vector4f &dst, Vector4f &src);
void floor(Vector4f &dst, Vector4f &src); void floor(Vector4f &dst, Vector4f &src);
void round(Vector4f &dst, Vector4f &src);
void ceil(Vector4f &dst, Vector4f &src); void ceil(Vector4f &dst, Vector4f &src);
void powx(Vector4f &dst, Vector4f &src0, Vector4f &src1, bool pp = false); void powx(Vector4f &dst, Vector4f &src0, Vector4f &src1, bool pp = false);
void pow(Vector4f &dst, Vector4f &src0, Vector4f &src1, bool pp = false); void pow(Vector4f &dst, Vector4f &src0, Vector4f &src1, bool pp = false);
...@@ -271,6 +318,12 @@ namespace sw ...@@ -271,6 +318,12 @@ namespace sw
void asin(Vector4f &dst, Vector4f &src, bool pp = false); void asin(Vector4f &dst, Vector4f &src, bool pp = false);
void atan(Vector4f &dst, Vector4f &src, bool pp = false); void atan(Vector4f &dst, Vector4f &src, bool pp = false);
void atan2(Vector4f &dst, Vector4f &src0, Vector4f &src1, bool pp = false); void atan2(Vector4f &dst, Vector4f &src0, Vector4f &src1, bool pp = false);
void cosh(Vector4f &dst, Vector4f &src, bool pp = false);
void sinh(Vector4f &dst, Vector4f &src, bool pp = false);
void tanh(Vector4f &dst, Vector4f &src, bool pp = false);
void acosh(Vector4f &dst, Vector4f &src, bool pp = false);
void asinh(Vector4f &dst, Vector4f &src, bool pp = false);
void atanh(Vector4f &dst, Vector4f &src, bool pp = false);
void expp(Vector4f &dst, Vector4f &src, unsigned short version); void expp(Vector4f &dst, Vector4f &src, unsigned short version);
void logp(Vector4f &dst, Vector4f &src, unsigned short version); void logp(Vector4f &dst, Vector4f &src, unsigned short version);
void cmp0(Vector4f &dst, Vector4f &src0, Vector4f &src1, Vector4f &src2); void cmp0(Vector4f &dst, Vector4f &src0, Vector4f &src1, Vector4f &src2);
......
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