Merge branch 'master' of https://collaborating.tuhh.de/cev7691/mandelbrot-zoom

4 files changed, 661 insertions, 32 deletions

diff --git a/Release/cl/mandelbrot32.cl b/Release/cl/mandelbrot32.cl
new file mode 100644
index 0000000..af0d0e9
--- /dev/null
+++ b/Release/cl/mandelbrot32.cl
@@ -0,0 +1,199 @@
+__kernel void calculate(__global uchar4 * mandelbrotImage, const float posx, const float posy, const float stepSizeX, const float stepSizeY, const uint maxIterations, const uint width)
+{
+    int tid = get_global_id(0);
+
+    int i = tid % (width / 4);
+    int j = tid / (width / 4);
+    
+    int4 veci = {4 * i, 4 * i + 1, 4 * i + 2, 4 * i + 3};
+    int4 vecj = {j, j, j, j};
+    
+    float4 x0;
+    x0.s0 = (float)(posx + stepSizeX * (float)veci.s0);
+    x0.s1 = (float)(posx + stepSizeX * (float)veci.s1);
+    x0.s2 = (float)(posx + stepSizeX * (float)veci.s2);
+    x0.s3 = (float)(posx + stepSizeX * (float)veci.s3);
+    float4 y0;
+    y0.s0 = (float)(posy + stepSizeY * (float)vecj.s0);
+    y0.s1 = (float)(posy + stepSizeY * (float)vecj.s1);
+    y0.s2 = (float)(posy + stepSizeY * (float)vecj.s2);
+    y0.s3 = (float)(posy + stepSizeY * (float)vecj.s3);
+
+    float4 x = x0;
+    float4 y = y0;
+    
+    uint iter=0;
+    float4 tmp;
+    int4 stay;
+    int4 ccount = 0;
+
+    stay.s0 = (x.s0 * x.s0 + y.s0 * y.s0) <= 4.0f;
+    stay.s1 = (x.s1 * x.s1 + y.s1 * y.s1) <= 4.0f;
+    stay.s2 = (x.s2 * x.s2 + y.s2 * y.s2) <= 4.0f;
+    stay.s3 = (x.s3 * x.s3 + y.s3 * y.s3) <= 4.0f;
+    float4 savx = x;
+    float4 savy = y;
+    for(iter=0; (stay.s0 | stay.s1 | stay.s2 | stay.s3) && (iter < maxIterations); iter+= 16)
+    {
+        x = savx;
+        y = savy;
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0));
+        y = MUL_ADD(2.0f * x, y, y0);
+        x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0f * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0));
+        y = MUL_ADD(2.0f * x, y, y0);
+        x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0f * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0));
+        y = MUL_ADD(2.0f * x, y, y0);
+        x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0f * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0));
+        y = MUL_ADD(2.0f * x, y, y0);
+        x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0f * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0));
+        y = MUL_ADD(2.0f * x, y, y0);
+        x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0f * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0));
+        y = MUL_ADD(2.0f * x, y, y0);
+        x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0f * tmp, y, y0);
+        
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0));
+        y = MUL_ADD(2.0f * x, y, y0);
+        x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0f * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0));
+        y = MUL_ADD(2.0f * x, y, y0);
+        x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0f * tmp, y, y0);
+
+        stay.s0 = (x.s0 * x.s0 + y.s0 * y.s0) <= 4.0f;
+        stay.s1 = (x.s1 * x.s1 + y.s1 * y.s1) <= 4.0f;
+        stay.s2 = (x.s2 * x.s2 + y.s2 * y.s2) <= 4.0f;
+        stay.s3 = (x.s3 * x.s3 + y.s3 * y.s3) <= 4.0f;
+
+        savx.s0 = (stay.s0 ? x.s0 : savx.s0);
+        savx.s1 = (stay.s1 ? x.s1 : savx.s1);
+        savx.s2 = (stay.s2 ? x.s2 : savx.s2);
+        savx.s3 = (stay.s3 ? x.s3 : savx.s3);
+        savy.s0 = (stay.s0 ? y.s0 : savy.s0);
+        savy.s1 = (stay.s1 ? y.s1 : savy.s1);
+        savy.s2 = (stay.s2 ? y.s2 : savy.s2);
+        savy.s3 = (stay.s3 ? y.s3 : savy.s3);
+        ccount += stay*16;
+    }
+    // Handle remainder
+    if (!(stay.s0 & stay.s1 & stay.s2 & stay.s3))
+    {
+        iter = 16;
+        do
+        {
+            x = savx;
+            y = savy;
+            stay.s0 = ((x.s0 * x.s0 + y.s0 * y.s0) <= 4.0f) && 
+						   (ccount.s0 < maxIterations);
+            stay.s1 = ((x.s1 * x.s1 + y.s1 * y.s1) <= 4.0f) && 
+				       (ccount.s1 < maxIterations);
+            stay.s2 = ((x.s2 * x.s2 + y.s2 * y.s2) <= 4.0f) && 
+				       (ccount.s2 < maxIterations);
+            stay.s3 = ((x.s3 * x.s3 + y.s3 * y.s3) <= 4.0f) && 
+				       (ccount.s3 < maxIterations);
+            tmp = x;
+            x = MUL_ADD(-y, y, MUL_ADD(x, x, x0));
+            y = MUL_ADD(2.0f * tmp, y, y0);
+            ccount += stay;
+            iter--;
+            savx.s0 = (stay.s0 ? x.s0 : savx.s0);
+            savx.s1 = (stay.s1 ? x.s1 : savx.s1);
+            savx.s2 = (stay.s2 ? x.s2 : savx.s2);
+            savx.s3 = (stay.s3 ? x.s3 : savx.s3);
+            savy.s0 = (stay.s0 ? y.s0 : savy.s0);
+            savy.s1 = (stay.s1 ? y.s1 : savy.s1);
+            savy.s2 = (stay.s2 ? y.s2 : savy.s2);
+            savy.s3 = (stay.s3 ? y.s3 : savy.s3);
+        } while ((stay.s0 | stay.s1 | stay.s2 | stay.s3) && iter);
+    }
+    x = savx;
+    y = savy;
+    float4 fc = convert_float4(ccount);
+    fc.s0 = (float)ccount.s0 + 1 - 
+			           native_log2(native_log2(x.s0 * x.s0 + y.s0 * y.s0));
+    fc.s1 = (float)ccount.s1 + 1 - 
+		           native_log2(native_log2(x.s1 * x.s1 + y.s1 * y.s1));
+    fc.s2 = (float)ccount.s2 + 1 - 
+				   native_log2(native_log2(x.s2 * x.s2 + y.s2 * y.s2));
+    fc.s3 = (float)ccount.s3 + 1 - 
+				   native_log2(native_log2(x.s3 * x.s3 + y.s3 * y.s3));
+				   
+    float c = fc.s0 * 2.0f * 3.1416f / 256.0f;
+    uchar4 color[4];
+    color[0].s0 = ((1.0f + native_cos(c)) * 0.5f) * 255;
+    color[0].s1 = ((1.0f + native_cos(2.0f * c + 2.0f * 3.1416f / 3.0f)) * 0.5f) * 255;
+    color[0].s2 = ((1.0f + native_cos(c - 2.0f * 3.1416f / 3.0f)) * 0.5f) * 255;
+    color[0].s3 = 0xff;
+    if (ccount.s0 == maxIterations)
+    {
+        color[0].s0 = 0;
+        color[0].s1 = 0;
+        color[0].s2 = 0;
+    }
+    mandelbrotImage[4 * tid] = color[0];    
+    c = fc.s1 * 2.0f * 3.1416f / 256.0f;
+    color[1].s0 = ((1.0f + native_cos(c)) * 0.5f) * 255;
+    color[1].s1 = ((1.0f + native_cos(2.0f * c + 2.0f * 3.1416f / 3.0f)) * 0.5f) * 255;
+    color[1].s2 = ((1.0f + native_cos(c - 2.0f * 3.1416f / 3.0f)) * 0.5f) * 255;
+    color[1].s3 = 0xff;
+    if (ccount.s1 == maxIterations)
+    {
+        color[1].s0 = 0;
+        color[1].s1 = 0;
+        color[1].s2 = 0;
+    }
+    mandelbrotImage[4 * tid + 1] = color[1];    
+    c = fc.s2 * 2.0f * 3.1416f / 256.0f;
+    color[2].s0 = ((1.0f + native_cos(c)) * 0.5f) * 255;
+    color[2].s1 = ((1.0f + native_cos(2.0f * c + 2.0f * 3.1416f / 3.0f)) * 0.5f) * 255;
+    color[2].s2 = ((1.0f + native_cos(c - 2.0f * 3.1416f / 3.0f)) * 0.5f) * 255;
+    color[2].s3 = 0xff;
+    if (ccount.s2 == maxIterations)
+    {
+        color[2].s0 = 0;
+        color[2].s1 = 0;
+        color[2].s2 = 0;
+    }
+    mandelbrotImage[4 * tid + 2] = color[2];    
+    c = fc.s3 * 2.0f * 3.1416f / 256.0f;
+    color[3].s0 = ((1.0f + native_cos(c)) * 0.5f) * 255;
+    color[3].s1 = ((1.0f + native_cos(2.0f * c + 2.0f * 3.1416f / 3.0f)) * 0.5f) * 255;
+    color[3].s2 = ((1.0f + native_cos(c - 2.0f * 3.1416f / 3.0f)) * 0.5f) * 255;
+    color[3].s3 = 0xff;
+    if (ccount.s3 == maxIterations)
+    {
+        color[3].s0 = 0;
+        color[3].s1 = 0;
+        color[3].s2 = 0;
+    }
+    mandelbrotImage[4 * tid + 3] = color[3];
+}
+
+#define native_log2 log2
+#define native_cos  cos
\ No newline at end of file
diff --git a/Release/cl/mandelbrot64.cl b/Release/cl/mandelbrot64.cl
new file mode 100644
index 0000000..be38b4a
--- /dev/null
+++ b/Release/cl/mandelbrot64.cl
@@ -0,0 +1,230 @@
+#ifdef KHR_DP_EXTENSION
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
+#else
+#pragma OPENCL EXTENSION cl_amd_fp64 : enable
+#endif
+
+__kernel void calculate(__global uchar4 * mandelbrotImage, const double posx, const double posy, const double stepSizeX, const double stepSizeY, const uint maxIterations, const uint width)
+{
+    int tid = get_global_id(0);
+
+    int i = tid % (width / 4);
+    int j = tid / (width / 4);
+    
+    int4 veci = {4 * i, 4 * i + 1, 4 * i + 2, 4 * i + 3};
+    int4 vecj = {j, j, j, j};
+    
+    double4 x0;
+    x0.s0 = (double)(posx + stepSizeX * (double)veci.s0);
+    x0.s1 = (double)(posx + stepSizeX * (double)veci.s1);
+    x0.s2 = (double)(posx + stepSizeX * (double)veci.s2);
+    x0.s3 = (double)(posx + stepSizeX * (double)veci.s3);
+    double4 y0;
+    y0.s0 = (double)(posy + stepSizeY * (double)vecj.s0);
+    y0.s1 = (double)(posy + stepSizeY * (double)vecj.s1);
+    y0.s2 = (double)(posy + stepSizeY * (double)vecj.s2);
+    y0.s3 = (double)(posy + stepSizeY * (double)vecj.s3);
+
+    double4 x = x0;
+    double4 y = y0;
+    
+    uint iter=0;
+    double4 tmp;
+    int4 stay;
+    int4 ccount = 0;
+
+    stay.s0 = (x.s0 * x.s0 + y.s0 * y.s0) <= 4.0;
+    stay.s1 = (x.s1 * x.s1 + y.s1 * y.s1) <= 4.0;
+    stay.s2 = (x.s2 * x.s2 + y.s2 * y.s2) <= 4.0;
+    stay.s3 = (x.s3 * x.s3 + y.s3 * y.s3) <= 4.0;
+    double4 savx = x;
+    double4 savy = y;
+    for(iter=0; (stay.s0 | stay.s1 | stay.s2 | stay.s3) && (iter < maxIterations); iter+= 16)
+    {
+        x = savx;
+        y = savy;
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0)); // tmp = x * x + x0 - y * y;
+        y = MUL_ADD(2.0 * x, y, y0); //y = 2.0 * x * y + y0;
+		x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));// x = tmp * tmp + x0 - y * y;
+        y = MUL_ADD(2.0 * tmp, y, y0); //y = 2.0 * tmp * y + y0;
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0)); 
+        y = MUL_ADD(2.0 * x, y, y0); 
+		x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0 * tmp, y, y0); 
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0)); 
+        y = MUL_ADD(2.0 * x, y, y0); 
+		x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0 * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0)); 
+        y = MUL_ADD(2.0 * x, y, y0); 
+		x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0 * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0)); 
+        y = MUL_ADD(2.0 * x, y, y0); 
+		x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0 * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0)); 
+        y = MUL_ADD(2.0 * x, y, y0); 
+		x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0 * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0)); 
+        y = MUL_ADD(2.0 * x, y, y0); 
+		x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0 * tmp, y, y0);
+
+        // Two iterations
+        tmp = MUL_ADD(-y, y, MUL_ADD(x, x, x0)); 
+        y = MUL_ADD(2.0 * x, y, y0); 
+		x = MUL_ADD(-y, y, MUL_ADD(tmp, tmp, x0));
+        y = MUL_ADD(2.0 * tmp, y, y0);
+
+        stay.s0 = (x.s0 * x.s0 + y.s0 * y.s0) <= 4.0;
+        stay.s1 = (x.s1 * x.s1 + y.s1 * y.s1) <= 4.0;
+        stay.s2 = (x.s2 * x.s2 + y.s2 * y.s2) <= 4.0;
+        stay.s3 = (x.s3 * x.s3 + y.s3 * y.s3) <= 4.0;
+
+        savx.s0 = (stay.s0 ? x.s0 : savx.s0);
+        savx.s1 = (stay.s1 ? x.s1 : savx.s1);
+        savx.s2 = (stay.s2 ? x.s2 : savx.s2);
+        savx.s3 = (stay.s3 ? x.s3 : savx.s3);
+        savy.s0 = (stay.s0 ? y.s0 : savy.s0);
+        savy.s1 = (stay.s1 ? y.s1 : savy.s1);
+        savy.s2 = (stay.s2 ? y.s2 : savy.s2);
+        savy.s3 = (stay.s3 ? y.s3 : savy.s3);
+        ccount += stay*16;
+    }
+    // Handle remainder
+    if (!(stay.s0 & stay.s1 & stay.s2 & stay.s3))
+    {
+        iter = 16;
+        do
+        {
+            x = savx;
+            y = savy;
+            stay.s0 = ((x.s0 * x.s0 + y.s0 * y.s0) <= 4.0) && 
+						   (ccount.s0 < maxIterations);
+            stay.s1 = ((x.s1 * x.s1 + y.s1 * y.s1) <= 4.0) && 
+				       (ccount.s1 < maxIterations);
+            stay.s2 = ((x.s2 * x.s2 + y.s2 * y.s2) <= 4.0) && 
+				       (ccount.s2 < maxIterations);
+            stay.s3 = ((x.s3 * x.s3 + y.s3 * y.s3) <= 4.0) && 
+				       (ccount.s3 < maxIterations);
+            tmp = x;
+            x = MUL_ADD(-y, y, MUL_ADD(x, x, x0)); 
+            y = MUL_ADD(2.0 * tmp, y, y0); //y = 2.0 * tmp * y + y0;
+            ccount += stay;
+            iter--;
+            savx.s0 = (stay.s0 ? x.s0 : savx.s0);
+            savx.s1 = (stay.s1 ? x.s1 : savx.s1);
+            savx.s2 = (stay.s2 ? x.s2 : savx.s2);
+            savx.s3 = (stay.s3 ? x.s3 : savx.s3);
+            savy.s0 = (stay.s0 ? y.s0 : savy.s0);
+            savy.s1 = (stay.s1 ? y.s1 : savy.s1);
+            savy.s2 = (stay.s2 ? y.s2 : savy.s2);
+            savy.s3 = (stay.s3 ? y.s3 : savy.s3);
+        } while ((stay.s0 | stay.s1 | stay.s2 | stay.s3) && iter);
+    }
+    x = savx;
+    y = savy;
+    double4 fc = convert_double4(ccount);
+    fc.s0 = (double)ccount.s0 + 1 - 
+			           native_log2(native_log2(x.s0 * x.s0 + y.s0 * y.s0));
+    fc.s1 = (double)ccount.s1 + 1 - 
+		           native_log2(native_log2(x.s1 * x.s1 + y.s1 * y.s1));
+    fc.s2 = (double)ccount.s2 + 1 - 
+				   native_log2(native_log2(x.s2 * x.s2 + y.s2 * y.s2));
+    fc.s3 = (double)ccount.s3 + 1 - 
+				   native_log2(native_log2(x.s3 * x.s3 + y.s3 * y.s3));
+				   
+    double c = fc.s0 * 2.0 * 3.1416 / 256.0;
+    uchar4 color[4];
+    color[0].s0 = ((1.0 + native_cos(c)) * 0.5) * 255;
+    color[0].s1 = ((1.0 + native_cos(2.0 * c + 2.0 * 3.1416 / 3.0)) * 0.5) * 255;
+    color[0].s2 = ((1.0 + native_cos(c - 2.0 * 3.1416 / 3.0)) * 0.5) * 255;
+    color[0].s3 = 0xff;
+    if (ccount.s0 == maxIterations)
+    {
+        color[0].s0 = 0;
+        color[0].s1 = 0;
+        color[0].s2 = 0;
+    }
+    if (bench)
+    {
+        color[0].s0 = ccount.s0 & 0xff;
+        color[0].s1 = (ccount.s0 & 0xff00) >> 8;
+        color[0].s2 = (ccount.s0 & 0xff0000) >> 16;
+        color[0].s3 = (ccount.s0 & 0xff000000) >> 24;
+    }
+    mandelbrotImage[4 * tid] = color[0];    
+    c = fc.s1 * 2.0 * 3.1416 / 256.0;
+    color[1].s0 = ((1.0 + native_cos(c)) * 0.5) * 255;
+    color[1].s1 = ((1.0 + native_cos(2.0 * c + 2.0 * 3.1416 / 3.0)) * 0.5) * 255;
+    color[1].s2 = ((1.0 + native_cos(c - 2.0 * 3.1416 / 3.0)) * 0.5) * 255;
+    color[1].s3 = 0xff;
+    if (ccount.s1 == maxIterations)
+    {
+        color[1].s0 = 0;
+        color[1].s1 = 0;
+        color[1].s2 = 0;
+    }
+    if (bench)
+    {
+        color[1].s0 = ccount.s1 & 0xff;
+        color[1].s1 = (ccount.s1 & 0xff00) >> 8;
+        color[1].s2 = (ccount.s1 & 0xff0000) >> 16;
+        color[1].s3 = (ccount.s1 & 0xff000000) >> 24;
+    }
+    mandelbrotImage[4 * tid + 1] = color[1];    
+    c = fc.s2 * 2.0 * 3.1416 / 256.0;
+    color[2].s0 = ((1.0 + native_cos(c)) * 0.5) * 255;
+    color[2].s1 = ((1.0 + native_cos(2.0 * c + 2.0 * 3.1416 / 3.0)) * 0.5) * 255;
+    color[2].s2 = ((1.0 + native_cos(c - 2.0 * 3.1416 / 3.0)) * 0.5) * 255;
+    color[2].s3 = 0xff;
+    if (ccount.s2 == maxIterations)
+    {
+        color[2].s0 = 0;
+        color[2].s1 = 0;
+        color[2].s2 = 0;
+    }
+    if (bench)
+    {
+        color[2].s0 = ccount.s2 & 0xff;
+        color[2].s1 = (ccount.s2 & 0xff00) >> 8;
+        color[2].s2 = (ccount.s2 & 0xff0000) >> 16;
+        color[2].s3 = (ccount.s2 & 0xff000000) >> 24;
+    }
+    mandelbrotImage[4 * tid + 2] = color[2];    
+    c = fc.s3 * 2.0 * 3.1416 / 256.0;
+    color[3].s0 = ((1.0 + native_cos(c)) * 0.5) * 255;
+    color[3].s1 = ((1.0 + native_cos(2.0 * c + 2.0 * 3.1416 / 3.0)) * 0.5) * 255;
+    color[3].s2 = ((1.0 + native_cos(c - 2.0 * 3.1416 / 3.0)) * 0.5) * 255;
+    color[3].s3 = 0xff;
+    if (ccount.s3 == maxIterations)
+    {
+        color[3].s0 = 0;
+        color[3].s1 = 0;
+        color[3].s2 = 0;
+    }
+    if (bench)
+    {
+        color[3].s0 = ccount.s3 & 0xff;
+        color[3].s1 = (ccount.s3 & 0xff00) >> 8;
+        color[3].s2 = (ccount.s3 & 0xff0000) >> 16;
+        color[3].s3 = (ccount.s3 & 0xff000000) >> 24;
+    }
+    mandelbrotImage[4 * tid + 3] = color[3];
+}
\ No newline at end of file
diff --git a/Release/coords.txt b/Release/coords.txt
new file mode 100644
index 0000000..3d161d0
--- /dev/null
+++ b/Release/coords.txt
@@ -0,0 +1,2 @@
+-1.7476645190
+0.00268845545
\ No newline at end of file
diff --git a/Release/glade/settings.glade b/Release/glade/settings.glade
index b91c11c..ff11a2c 100644
--- a/Release/glade/settings.glade
+++ b/Release/glade/settings.glade
@@ -93,7 +93,7 @@
                   <object class="GtkTable" id="table3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="n_rows">5</property>
+                    <property name="n_rows">6</property>
                     <property name="n_columns">2</property>
                     <property name="homogeneous">True</property>
                     <child>
@@ -102,6 +102,10 @@
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Max. iterations</property>
                       </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkSpinButton" id="iterationsSp">
@@ -116,6 +120,8 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                       </packing>
                     </child>
                     <child>
@@ -214,34 +220,6 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="threadsLbl">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Threads</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="threadsSp">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">False</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
                       <object class="GtkLabel" id="zoomLbl">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -370,6 +348,78 @@
                         <property name="bottom_attach">5</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="setLbl">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Set</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="modeLbl">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Render mode</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox9">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkRadioButton" id="modeCPURd">
+                            <property name="label" translatable="yes">CPU</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">modeGPURd</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="modeGPURd">
+                            <property name="label" translatable="yes">GPU (OpenCL)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">modeCPURd</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="setCombo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -390,6 +440,154 @@
           </packing>
         </child>
         <child>
+          <object class="GtkHBox" id="hbox8">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkFrame" id="cpuFrame">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkTable" id="table4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="n_columns">2</property>
+                        <child>
+                          <object class="GtkLabel" id="threadsLbl">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Threads</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="threadsSp">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">●</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="cpuLbl">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">CPU</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="gpuFrame">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkHBox" id="hbox10">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkLabel" id="fpuLbl">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">FPU float depth</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBoxText" id="fpuCombo">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="fmaCb">
+                            <property name="label" translatable="yes">Enable Fused Multiply/Add (FMA)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="gpuLbl">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">GPU</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkFrame" id="videoFrame">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -648,7 +846,7 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -723,7 +921,7 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <child>
@@ -760,7 +958,7 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="position">4</property>
           </packing>
         </child>
       </object>