diff --git a/Source/Ember/Ember.h b/Source/Ember/Ember.h index 215a57b..1b9addd 100644 --- a/Source/Ember/Ember.h +++ b/Source/Ember/Ember.h @@ -19,7 +19,7 @@ template class Interpolater; /// Bit position specifying the presence of each type of 3D parameter. /// One, none, some or all of these can be present. /// -enum class eProjBits : et +enum class eProjBits : unsigned char { PROJBITS_ZPOS = 1, PROJBITS_PERSP = 2, diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index 5652d02..06f450f 100644 --- a/Source/Ember/EmberDefines.h +++ b/Source/Ember/EmberDefines.h @@ -80,7 +80,7 @@ namespace EmberNs #define CURVES_LENGTH_M1 65535.0f #define ONE_OVER_CURVES_LENGTH_M1 1.525902189669e-5f #define EMPTYFIELD -9999 -typedef uint et; +typedef unsigned char et; typedef std::lock_guard rlg; /// diff --git a/Source/Ember/SheepTools.h b/Source/Ember/SheepTools.h index 56872e4..a33c645 100644 --- a/Source/Ember/SheepTools.h +++ b/Source/Ember/SheepTools.h @@ -14,7 +14,7 @@ namespace EmberNs /// /// Mutation mode enum. /// -enum class eMutateMode : int +enum class eMutateMode : char { MUTATE_NOT_SPECIFIED = -1, MUTATE_ALL_VARIATIONS = 0, @@ -29,7 +29,7 @@ enum class eMutateMode : int /// /// Cross mode enum. /// -enum class eCrossMode : int +enum class eCrossMode : char { CROSS_NOT_SPECIFIED = -1, CROSS_UNION = 0, diff --git a/Source/Ember/Utils.h b/Source/Ember/Utils.h index 671ea06..527b97a 100644 --- a/Source/Ember/Utils.h +++ b/Source/Ember/Utils.h @@ -19,7 +19,7 @@ namespace EmberNs /// /// Enum to encapsulate and add type safety to the thread priority defines. /// -enum class eThreadPriority : int +enum class eThreadPriority : char { LOWEST = THREAD_PRIORITY_LOWEST,//-2 BELOW_NORMAL = THREAD_PRIORITY_BELOW_NORMAL,//-1 diff --git a/Source/Ember/Variation.h b/Source/Ember/Variation.h index 095dd78..0bc522b 100644 --- a/Source/Ember/Variation.h +++ b/Source/Ember/Variation.h @@ -44,7 +44,7 @@ enum class eVariationAssignType : et /// /// Complete list of every variation class ID. /// -enum class eVariationId : et +enum class eVariationId : glm::uint { VAR_ARCH, VAR_ARCSECH, @@ -52,8 +52,6 @@ enum class eVariationId : et VAR_ARCSINH, VAR_ARCTANH, VAR_ASTERIA, - //VAR_ARCSINH, - //VAR_ARCTANH, VAR_AUGER , VAR_BARYCENTROID, VAR_BCIRCLE , @@ -471,8 +469,6 @@ enum class eVariationId : et VAR_PRE_ARCSINH, VAR_PRE_ARCTANH, VAR_PRE_ASTERIA, - //VAR_PRE_ARCSINH, - //VAR_PRE_ARCTANH, VAR_PRE_AUGER, VAR_PRE_BARYCENTROID, VAR_PRE_BCIRCLE, @@ -889,8 +885,6 @@ enum class eVariationId : et VAR_POST_ARCSINH, VAR_POST_ARCTANH, VAR_POST_ASTERIA, - //VAR_POST_ARCSINH, - //VAR_POST_ARCTANH, VAR_POST_AUGER, VAR_POST_BARYCENTROID, VAR_POST_BCIRCLE, diff --git a/Source/EmberCL/FunctionMapper.cpp b/Source/EmberCL/FunctionMapper.cpp index 4a00ab2..ef91bd7 100644 --- a/Source/EmberCL/FunctionMapper.cpp +++ b/Source/EmberCL/FunctionMapper.cpp @@ -12,13 +12,13 @@ FunctionMapper::FunctionMapper() s_GlobalMap["LRint"] = "inline real_t LRint(real_t x)\n" "{\n" - " intPrec temp = (x >= 0.0 ? (intPrec)(x + 0.5) : (intPrec)(x - 0.5));\n" + " intPrec temp = (x >= (real_t)0.0 ? (intPrec)(x + (real_t)0.5) : (intPrec)(x - (real_t)0.5));\n" " return (real_t)temp;\n" "}\n"; s_GlobalMap["Round"] = "inline real_t Round(real_t r)\n" "{\n" - " return (r > 0.0) ? floor(r + 0.5) : ceil(r - 0.5);\n" + " return (r > (real_t)0.0) ? floor(r + (real_t)0.5) : ceil(r - (real_t)0.5);\n" "}\n"; s_GlobalMap["Fract"] = "inline real_t Fract(real_t x)\n" @@ -28,17 +28,17 @@ FunctionMapper::FunctionMapper() s_GlobalMap["HashShadertoy"] = "inline real_t HashShadertoy(real_t x, real_t y, real_t seed)\n" "{\n" - " return Fract(sin(fma(x, 12.9898, fma(y, 78.233, seed))) * 43758.5453);\n" + " return Fract(sin(fma(x, (real_t)12.9898, fma(y, (real_t)78.233, seed))) * (real_t)43758.5453);\n" "}\n"; s_GlobalMap["Sign"] = "inline real_t Sign(real_t v)\n" "{\n" - " return (v < 0.0) ? -1 : (v > 0.0) ? 1 : 0.0;\n" + " return (v < (real_t)0.0) ? (real_t)-1.0 : (v > (real_t)0.0) ? 1 : (real_t)0.0;\n" "}\n"; s_GlobalMap["SignNz"] = "inline real_t SignNz(real_t v)\n" "{\n" - " return (v < 0.0) ? -1.0 : 1.0;\n" + " return (v < (real_t)0.0) ? (real_t)-1.0 : (real_t)1.0;\n" "}\n"; s_GlobalMap["Sqr"] = "inline real_t Sqr(real_t v)\n" @@ -48,8 +48,8 @@ FunctionMapper::FunctionMapper() s_GlobalMap["SafeSqrt"] = "inline real_t SafeSqrt(real_t x)\n" "{\n" - " if (x <= 0.0)\n" - " return 0.0;\n" + " if (x <= (real_t)0.0)\n" + " return (real_t)0.0;\n" "\n" " return sqrt(x);\n" "}\n"; @@ -57,7 +57,7 @@ FunctionMapper::FunctionMapper() "inline real_t SafeDivInv(real_t q, real_t r)\n" "{\n" " if (r < EPS)\n" - " return 1 / r;\n" + " return (real_t)1.0 / r;\n" "\n" " return q / r;\n" "}\n"; @@ -74,7 +74,7 @@ FunctionMapper::FunctionMapper() s_GlobalMap["Spread"] = "inline real_t Spread(real_t x, real_t y)\n" "{\n" - " return Hypot(x, y) * ((x) > 0.0 ? 1.0 : -1.0);\n" + " return Hypot(x, y) * ((x) > (real_t)0.0 ? (real_t)1.0 : (real_t)-1.0);\n" "}\n"; s_GlobalMap["Powq4"] = "inline real_t Powq4(real_t x, real_t y)\n" @@ -84,12 +84,12 @@ FunctionMapper::FunctionMapper() s_GlobalMap["Powq4c"] = "inline real_t Powq4c(real_t x, real_t y)\n" "{\n" - " return y == 1.0 ? x : Powq4(x, y);\n" + " return y == (real_t)1.0 ? x : Powq4(x, y);\n" "}\n"; s_GlobalMap["Zeps"] = "inline real_t Zeps(real_t x)\n" "{\n" - " return x != 0.0 ? x : EPS;\n" + " return x != (real_t)0.0 ? x : EPS;\n" "}\n"; s_GlobalMap["Lerp"] = "inline real_t Lerp(real_t a, real_t b, real_t p)\n" @@ -106,22 +106,22 @@ FunctionMapper::FunctionMapper() s_GlobalMap["Fosc"] = "inline real_t Fosc(real_t p, real_t amp, real_t ph)\n" "{\n" - " return 0.5 - cos(fma(p, amp, ph)) * 0.5;\n" + " return (real_t)0.5 - cos(fma(p, amp, ph)) * (real_t)0.5;\n" "}\n"; s_GlobalMap["Foscn"] = "inline real_t Foscn(real_t p, real_t ph)\n" "{\n" - " return 0.5 - cos(p + ph) * 0.5;\n" + " return (real_t)0.5 - cos(p + ph) * (real_t)0.5;\n" "}\n"; s_GlobalMap["LogScale"] = "inline real_t LogScale(real_t x)\n" "{\n" - " return x == 0.0 ? 0.0 : log((fabs(x) + 1) * M_E) * SignNz(x) / M_E;\n" + " return x == (real_t)0.0 ? (real_t)0.0 : log((fabs(x) + 1) * M_E) * SignNz(x) / M_E;\n" "}\n"; s_GlobalMap["LogMap"] = "inline real_t LogMap(real_t x)\n" "{\n" - " return x == 0.0 ? 0.0 : (M_E + log(x * M_E)) * 0.25 * SignNz(x);\n" + " return x == (real_t)0.0 ? (real_t)0.0 : (M_E + log(x * M_E)) * (real_t)0.25 * SignNz(x);\n" "}\n"; s_GlobalMap["ClampGte"] = "inline real_t ClampGte(real_t val, real_t gte)\n" @@ -149,7 +149,7 @@ FunctionMapper::FunctionMapper() s_GlobalMap["ComplexDivComplex"] = "inline real2 ComplexDivComplex(real2 a, real2 b)\n" "{\n" - " real_t s = 1.0 / Zeps(fma(b.x, b.x, b.y * b.y));\n" + " real_t s = (real_t)1.0 / Zeps(fma(b.x, b.x, b.y * b.y));\n" " return (real2)(fma(a.x, b.x, a.y * b.y), fma(a.y, b.x, -(a.x * b.y))) * s;\n" "}\n"; s_GlobalMap["ComplexMultReal"] = @@ -186,12 +186,12 @@ FunctionMapper::FunctionMapper() "inline real2 ComplexSqrt(real2 a)\n" "{\n" " real_t mag = Hypot(a.x, a.y);\n" - " return ComplexMultReal((real2)(sqrt(mag + a.x), Sign(a.y) * sqrt(mag - a.x)), 0.5 * sqrt(2.0));\n" + " return ComplexMultReal((real2)(sqrt(mag + a.x), Sign(a.y) * sqrt(mag - a.x)), (real_t)0.5 * sqrt((real_t)2.0));\n" "}\n"; s_GlobalMap["ComplexLog"] = "inline real2 ComplexLog(real2 a)\n" "{\n" - " return (real2)(0.5 * log(fma(a.x, a.x, a.y * a.y)), atan2(a.y, a.x));\n" + " return (real2)((real_t)0.5 * log(fma(a.x, a.x, a.y * a.y)), atan2(a.y, a.x));\n" "}\n"; s_GlobalMap["ComplexExp"] = "inline real2 ComplexExp(real2 a)\n" @@ -213,7 +213,7 @@ FunctionMapper::FunctionMapper() "{\n" " real2 pmq = *p - *q;\n" "\n" - " if (pmq.x == 0 && pmq.y == 0)\n" + " if (pmq.x == (real_t)0.0 && pmq.y == (real_t)0.0)\n" " return 1.0;\n" "\n" " return 2 * (((*u).x - (*q).x) * pmq.x + ((*u).y - (*q).y) * pmq.y) / Zeps(SQR(pmq.x) + SQR(pmq.y));\n" @@ -265,11 +265,11 @@ FunctionMapper::FunctionMapper() " real4 c[4];\n" " real_t n = 0;\n" " int gi[4];\n" - " real_t skewIn = ((*v).x + (*v).y + (*v).z) * 0.333333;\n" + " real_t skewIn = ((*v).x + (*v).y + (*v).z) * (real_t)0.333333;\n" " int i = (int)floor((*v).x + skewIn);\n" " int j = (int)floor((*v).y + skewIn);\n" " int k = (int)floor((*v).z + skewIn);\n" - " real_t t = (i + j + k) * 0.1666666;\n" + " real_t t = (i + j + k) * (real_t)0.1666666;\n" " real_t x0 = i - t;\n" " real_t y0 = j - t;\n" " real_t z0 = k - t;\n" @@ -317,15 +317,15 @@ FunctionMapper::FunctionMapper() " }\n" " }\n" "\n" - " c[1].x = c[0].x - i1 + 0.1666666;\n" - " c[1].y = c[0].y - j1 + 0.1666666;\n" - " c[1].z = c[0].z - k1 + 0.1666666;\n" - " c[2].x = c[0].x - i2 + 2 * 0.1666666;\n" - " c[2].y = c[0].y - j2 + 2 * 0.1666666;\n" - " c[2].z = c[0].z - k2 + 2 * 0.1666666;\n" - " c[3].x = c[0].x - 1 + 3 * 0.1666666;\n" - " c[3].y = c[0].y - 1 + 3 * 0.1666666;\n" - " c[3].z = c[0].z - 1 + 3 * 0.1666666;\n" + " c[1].x = c[0].x - i1 + (real_t)0.1666666;\n" + " c[1].y = c[0].y - j1 + (real_t)0.1666666;\n" + " c[1].z = c[0].z - k1 + (real_t)0.1666666;\n" + " c[2].x = c[0].x - i2 + 2 * (real_t)0.1666666;\n" + " c[2].y = c[0].y - j2 + 2 * (real_t)0.1666666;\n" + " c[2].z = c[0].z - k2 + 2 * (real_t)0.1666666;\n" + " c[3].x = c[0].x - 1 + 3 * (real_t)0.1666666;\n" + " c[3].y = c[0].y - 1 + 3 * (real_t)0.1666666;\n" + " c[3].z = c[0].z - 1 + 3 * (real_t)0.1666666;\n" " int ii = i & 0x3ff;\n" " int jj = j & 0x3ff;\n" " int kk = k & 0x3ff;\n" @@ -355,7 +355,7 @@ FunctionMapper::FunctionMapper() "inline real_t PerlinNoise3D(real4* v, __global real_t* p, __global real_t* grad, real_t aScale, real_t fScale, int octaves)\n" "{\n" " int i;\n" - " real_t n = 0.0, a = 1.0;\n" + " real_t n = 0.0, a = (real_t)1.0;\n" " real4 u = *v;\n" "\n" " for (i = 0; i < octaves; i++)\n" @@ -390,7 +390,7 @@ FunctionMapper::FunctionMapper() " }\n" " else\n" " {\n" - " z = 1 / z;\n" + " z = (real_t)1.0 / z;\n" " s1 = num[0];\n" " s2 = denom[0];\n" "\n" @@ -408,49 +408,49 @@ FunctionMapper::FunctionMapper() s_GlobalMap["J1"] = "inline real_t J1(real_t x, __global real_t* P1, __global real_t* Q1, __global real_t* P2, __global real_t* Q2, __global real_t* PC, __global real_t* QC, __global real_t* PS, __global real_t* QS)//This function was taken from boost.org.\n" "{\n" - " real_t x1 = 3.8317059702075123156e+00,\n" - " x2 = 7.0155866698156187535e+00,\n" - " x11 = 9.810e+02,\n" - " x12 = -3.2527979248768438556e-04,\n" - " x21 = 1.7960e+03,\n" - " x22 = -3.8330184381246462950e-05;\n" + " real_t x1 = (real_t)3.8317059702075123156e+00,\n" + " x2 = (real_t)7.0155866698156187535e+00,\n" + " x11 = (real_t)9.810e+02,\n" + " x12 = (real_t)-3.2527979248768438556e-04,\n" + " x21 = (real_t)1.7960e+03,\n" + " x22 = (real_t)-3.8330184381246462950e-05;\n" " real_t value, factor, r, rc, rs, w;\n" " w = fabs(x);\n" "\n" - " if (x == 0)\n" + " if (x == (real_t)0.0)\n" " {\n" - " return 0.0;\n" + " return (real_t)0.0;\n" " }\n" "\n" - " if (w <= 4)\n" + " if (w <= (real_t)4.0)\n" " {\n" " real_t y = x * x;\n" " r = EvalRational(P1, Q1, y, 7);\n" - " factor = w * (w + x1) * ((w - x11 / 256) - x12);\n" + " factor = w * (w + x1) * ((w - x11 / (real_t)256.0) - x12);\n" " value = factor * r;\n" " }\n" - " else if (w <= 8)\n" + " else if (w <= (real_t)8.0)\n" " {\n" " real_t y = x * x;\n" " r = EvalRational(P2, Q2, y, 8);\n" - " factor = w * (w + x2) * ((w - x21 / 256) - x22);\n" + " factor = w * (w + x2) * ((w - x21 / (real_t)256.0) - x22);\n" " value = factor * r;\n" " }\n" " else\n" " {\n" - " real_t y = 8 / w;\n" + " real_t y = (real_t)8.0 / w;\n" " real_t y2 = y * y;\n" " rc = EvalRational(PC, QC, y2, 7);\n" " rs = EvalRational(PS, QS, y2, 7);\n" - " factor = 1 / (sqrt(w) * 1.772453850905516027);//sqrt pi\n" + " factor = 1 / (sqrt(w) * (real_t)1.772453850905516027);//sqrt pi\n" " real_t sx = sin(x);\n" " real_t cx = cos(x);\n" " value = factor * (rc * (sx - cx) + y * rs * (sx + cx));\n" " }\n" "\n" - " if (x < 0)\n" + " if (x < (real_t)0.0)\n" " {\n" - " value *= -1;\n" + " value *= (real_t)-1.0;\n" " }\n" "\n" " return value;\n" @@ -458,8 +458,8 @@ FunctionMapper::FunctionMapper() s_GlobalMap["JacobiElliptic"] = "inline void JacobiElliptic(real_t uu, real_t emmc, real_t* sn, real_t* cn, real_t* dn)\n" "{\n" - " real_t CA = 0.0003;\n" - " real_t a, b, c, d = 1, em[13], en[13];\n" + " real_t CA = (real_t)0.0003;\n" + " real_t a, b, c, d = (real_t)1.0, em[13], en[13];\n" " int bo;\n" " int l;\n" " int ii;\n" @@ -476,14 +476,14 @@ FunctionMapper::FunctionMapper() "\n" " if (bo != 0)\n" " {\n" - " d = 1 - emc;\n" + " d = (real_t)1.0 - emc;\n" " emc = -emc / d;\n" " d = sqrt(d);\n" " u = d * u;\n" " }\n" "\n" - " a = 1;\n" - " *dn = 1;\n" + " a = (real_t)1.0;\n" + " *dn = (real_t)1.0;\n" "\n" " for (i = 0; i < 8; i++)\n" " {\n" @@ -491,7 +491,7 @@ FunctionMapper::FunctionMapper() " em[i] = a;\n" " emc = sqrt(emc);\n" " en[i] = emc;\n" - " c = 0.5 * (a + emc);\n" + " c = (real_t)0.5 * (a + emc);\n" "\n" " if (fabs(a - emc) <= CA * a)\n" " break;\n" @@ -503,7 +503,7 @@ FunctionMapper::FunctionMapper() " u = c * u;\n" " *sn = sincos(u, cn);\n" "\n" - " if (*sn != 0)\n" + " if (*sn != (real_t)0.0)\n" " {\n" " a = *cn / *sn;\n" " c = a * c;\n" @@ -519,7 +519,7 @@ FunctionMapper::FunctionMapper() "\n" " a = 1 / sqrt(fma(c, c, (real_t)(1.0)));\n" "\n" - " if (*sn < 0)\n" + " if (*sn < (real_t)0.0)\n" " *sn = -a;\n" " else\n" " *sn = a;\n" diff --git a/Source/EmberCL/IterOpenCLKernelCreator.cpp b/Source/EmberCL/IterOpenCLKernelCreator.cpp index 61b4d0b..24d25cc 100644 --- a/Source/EmberCL/IterOpenCLKernelCreator.cpp +++ b/Source/EmberCL/IterOpenCLKernelCreator.cpp @@ -572,6 +572,10 @@ string IterOpenCLKernelCreator::GlobalFunctionsString(const Ember& ember) { auto names = var->OpenCLGlobalFuncNames(); + if (var->NeedPrecalcAngles()) + if (!Contains(funcNames, zeps)) + funcNames.push_back(zeps); + for (auto& name : names) if (!Contains(funcNames, name)) funcNames.push_back(name);