1 files changed, 230 insertions, 230 deletions
diff --git a/BuddhaTest/src/BuddhaTest.cpp b/BuddhaTest/src/BuddhaTest.cpp
index ccbb011..354cdcb 100644
--- a/BuddhaTest/src/BuddhaTest.cpp
+++ b/BuddhaTest/src/BuddhaTest.cpp
@@ -1,230 +1,230 @@
-#include <glad/glad.h>
-#include <GLFW/glfw3.h>
-#include <Helpers.h>
-#include <iostream>
-#include <vector>
-#include <chrono>
-#include <algorithm>
-
-void error_callback(int error, const char* description)
-{
-    std::cerr << "Error: " << description << std::endl;
-}
-
-void framebuffer_size_callback(GLFWwindow* window, int width, int height)
-{
-    glViewport(0, 0, width, height);
-}
-
-int main(int argc, char * argv[])
-{
-    Helpers::RenderSettings settings;
-
-    if(!settings.ParseCommandLine(argc,argv))
-    {
-        return 2;
-    }
-
-    unsigned int bufferHeight = settings.imageHeight/2;
-
-    GLFWwindow* window;
-
-    /* Initialize the library */
-    if (!glfwInit())
-        return -1;
-
-    glfwSetErrorCallback(error_callback);
-
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
-    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-
-    /* Create a windowed mode window and its OpenGL context */
-    window = glfwCreateWindow(settings.windowWidth, settings.windowHeight, "Buddhabrot", NULL, NULL);
-    if (!window)
-    {
-        std::cerr << "Failed to create OpenGL 4.3 core context. We do not support compatibility contexts." << std::endl;
-        glfwTerminate();
-        return -1;
-    }
-
-    //register callback on window resize:
-    glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
-
-    /* Make the window's context current */
-    glfwMakeContextCurrent(window);
-    gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
-
-    //disable vsync
-    glfwSwapInterval(0);
-
-    //we have a context. Let's check if input is sane.
-    //calcualte buffer size, and make sure it's allowed by the driver.
-    const unsigned int pixelCount{(settings.imageWidth * bufferHeight)};
-    if(!settings.CheckValidity())
-    {
-        glfwTerminate();
-        return 1;
-    }
-
-    // Create and compile our GLSL program from the shaders
-    std::string vertexPath("Shaders/BuddhaVertex.glsl");
-    std::string fragmentPath("Shaders/BuddhaFragment.glsl");
-    std::string computePath("Shaders/BuddhaCompute.glsl");
-
-    if(!Helpers::DoesFileExist(vertexPath))
-    {
-#if defined _WIN32 || defined __CYGWIN__
-        std::string separator("\\");
-#else
-        std::string separator("/");
-#endif
-        vertexPath = INSTALL_PREFIX + separator + "share" + separator + "BuddhaShader" + separator + vertexPath;
-        fragmentPath = INSTALL_PREFIX + separator + "share" + separator + "BuddhaShader" + separator + fragmentPath;
-        computePath = INSTALL_PREFIX + separator + "share" + separator + "BuddhaShader" + separator + computePath;
-    }
-
-    GLuint VertexAndFragmentShaders = Helpers::LoadShaders(vertexPath, fragmentPath);
-    //Do the same for the compute shader:
-    GLuint ComputeShader = Helpers::LoadComputeShader(computePath, settings.localWorkgroupSizeX, settings.localWorkgroupSizeY, settings.localWorkgroupSizeZ);
-    if(VertexAndFragmentShaders == 0 || ComputeShader == 0)
-    {
-        std::cerr << "Something went wrong with loading the shaders. Abort." << std::endl;
-        glfwTerminate();
-        return 1;
-    }
-
-    GLuint VertexArrayID;
-    glGenVertexArrays(1, &VertexArrayID);
-    glBindVertexArray(VertexArrayID);
-
-    const GLfloat g_vertex_buffer_data[] = {
-        -1.0f, -1.0f, 0.0f,
-        1.0f, -1.0f, 0.0f,
-        -1.0f,  1.0f, 0.0f,
-        1.0f, 1.0f, 0.0f
-    };
-
-    GLuint vertexbuffer;
-    glGenBuffers(1, &vertexbuffer);
-    glBindBuffer(GL_ARRAY_BUFFER, vertexbuffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(g_vertex_buffer_data), g_vertex_buffer_data, GL_STATIC_DRAW);
-
-
-    GLuint drawBuffer[3];
-    glGenBuffers(3, drawBuffer);
-    for(int i=0; i < 3; ++i)
-    {
-        glBindBuffer(GL_SHADER_STORAGE_BUFFER, drawBuffer[i]);
-        {
-            glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * pixelCount, nullptr, GL_DYNAMIC_COPY);
-            glClearBufferData(GL_SHADER_STORAGE_BUFFER,GL_R8,GL_RED,GL_UNSIGNED_INT,nullptr);
-        }
-        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2+i, drawBuffer[i]);
-    }
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
-
-    const uint32_t workersPerFrame = settings.globalWorkGroupSizeX*settings.globalWorkGroupSizeY*settings.globalWorkGroupSizeZ*settings.localWorkgroupSizeX*settings.localWorkgroupSizeY*settings.localWorkgroupSizeZ;
-    GLuint stateBuffer;
-    glGenBuffers(1,&stateBuffer);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER,stateBuffer);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, 4*(5*workersPerFrame),nullptr,GL_DYNAMIC_COPY);
-    glClearBufferData(GL_SHADER_STORAGE_BUFFER,GL_R8,GL_RED,GL_UNSIGNED_INT,nullptr);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 5, stateBuffer);
-
-    glUseProgram(ComputeShader);
-    GLint orbitLengthUniformHandle = glGetUniformLocation(ComputeShader, "orbitLength");
-    GLint widthUniformComputeHandle = glGetUniformLocation(ComputeShader, "width");
-    GLint heightUniformComputeHandle = glGetUniformLocation(ComputeShader, "height");
-    GLint iterationsPerDispatchHandle = glGetUniformLocation(ComputeShader, "iterationsPerDispatch");
-    glUniform3ui(orbitLengthUniformHandle,settings.orbitLengthRed,settings.orbitLengthGreen,settings.orbitLengthBlue);
-    glUniform1ui(widthUniformComputeHandle, settings.imageWidth);
-    glUniform1ui(heightUniformComputeHandle, bufferHeight);
-
-    glUseProgram(VertexAndFragmentShaders);
-    GLint widthUniformFragmentHandle = glGetUniformLocation(VertexAndFragmentShaders, "width");
-    GLint heightUniformFragmentHandle = glGetUniformLocation(VertexAndFragmentShaders, "height");
-    glUniform1ui(widthUniformFragmentHandle, settings.imageWidth);
-    glUniform1ui(heightUniformFragmentHandle, bufferHeight);
-    glClearColor(0.0f, 0.0f, 0.4f, 0.0f);
-
-    uint32_t iterationsPerFrame = 1;
-
-    Helpers::PIDController<float, std::chrono::high_resolution_clock::time_point::rep> pid{0.0f,0.0f,1e-4f};
-    const uint32_t targetFrameDuration{1000000/settings.targetFrameRate};
-
-    /* Loop until the user closes the window */
-    while (!glfwWindowShouldClose(window))
-    {
-        auto frameStart{std::chrono::high_resolution_clock::now()};
-        //let the compute shader do something
-        glUseProgram(ComputeShader);
-        glUniform1ui(iterationsPerDispatchHandle, iterationsPerFrame);
-        glDispatchCompute(settings.globalWorkGroupSizeX, settings.globalWorkGroupSizeY, settings.globalWorkGroupSizeZ);
-
-        //before reading the values in the ssbo, we need a memory barrier:
-        glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT); //I hope this is the correct (and only required) bit
-
-        /* Render here */
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        glUseProgram(VertexAndFragmentShaders);
-
-        glEnableVertexAttribArray(0);
-        glBindBuffer(GL_ARRAY_BUFFER, vertexbuffer);
-        glVertexAttribPointer(
-                    0,                  // attribute 0. No particular reason for 0, but must match the layout in the shader.
-                    3,                  // size
-                    GL_FLOAT,           // type
-                    GL_FALSE,           // normalized?
-                    0,                  // stride
-                    (void*)0            // array buffer offset
-                    );
-        // Draw the triangle strip!
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); // Triangle strip with 4 vertices -> quad.
-        glDisableVertexAttribArray(0);
-
-        /* Swap front and back buffers */
-        glfwSwapBuffers(window);
-
-        /* Poll for and process events */
-        glfwPollEvents();
-        auto frameStop{std::chrono::high_resolution_clock::now()};
-        const auto dur{std::chrono::duration_cast<std::chrono::microseconds>(frameStop-frameStart)};
-        auto frameDuration{dur.count()};
-        if(frameDuration > 0)
-        {
-            const auto error{targetFrameDuration - frameDuration};
-            const auto pidOutput{pid.Update(1,float(error))};
-            iterationsPerFrame = std::max(1,static_cast<int>(pidOutput));
-
-            //std::cout << iterationsPerFrame << " " << pidOutput << std::endl;
-        }
-    }
-
-    if(!settings.pngFilename.empty())
-    {
-        glMemoryBarrier(GL_ALL_BARRIER_BITS);
-        std::vector<std::vector<uint32_t>> readBackBuffers(3,std::vector<uint32_t>(pixelCount));
-        for(int i = 0; i < 3; ++i)
-        {
-            glBindBuffer(GL_SHADER_STORAGE_BUFFER, drawBuffer[i]);
-            glGetBufferSubData(GL_SHADER_STORAGE_BUFFER,0,4 * pixelCount,readBackBuffers[i].data());
-        }
-
-        //too lazy to change WriteOutputPng...
-        std::vector<uint32_t> combinedBuffer(3*pixelCount);
-        for(uint32_t i=0;i<3*pixelCount;++i)
-        {
-            combinedBuffer[i] = readBackBuffers[i%3][i/3];
-        }
-        Helpers::WriteOutputPNG(settings.pngFilename,combinedBuffer,settings.imageWidth,bufferHeight, settings.pngGamma, settings.pngColorScale);
-    }
-
-    //a bit of cleanup
-    glDeleteBuffers(1,&vertexbuffer);
-    glDeleteBuffers(3,drawBuffer);
-    glDeleteBuffers(1,&stateBuffer);
-
-    glfwTerminate();
-    return 0;
-}
+#include <glad/glad.h>
+#include <GLFW/glfw3.h>
+#include <Helpers.h>
+#include <iostream>
+#include <vector>
+#include <chrono>
+#include <algorithm>
+
+void error_callback(int error, const char* description)
+{
+    std::cerr << "Error: " << description << std::endl;
+}
+
+void framebuffer_size_callback(GLFWwindow* window, int width, int height)
+{
+    glViewport(0, 0, width, height);
+}
+
+int main(int argc, char * argv[])
+{
+    Helpers::RenderSettings settings;
+
+    if(!settings.ParseCommandLine(argc,argv))
+    {
+        return 2;
+    }
+
+    unsigned int bufferHeight = settings.imageHeight/2;
+
+    GLFWwindow* window;
+
+    /* Initialize the library */
+    if (!glfwInit())
+        return -1;
+
+    glfwSetErrorCallback(error_callback);
+
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+
+    /* Create a windowed mode window and its OpenGL context */
+    window = glfwCreateWindow(settings.windowWidth, settings.windowHeight, "Buddhabrot", NULL, NULL);
+    if (!window)
+    {
+        std::cerr << "Failed to create OpenGL 4.3 core context. We do not support compatibility contexts." << std::endl;
+        glfwTerminate();
+        return -1;
+    }
+
+    //register callback on window resize:
+    glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
+
+    /* Make the window's context current */
+    glfwMakeContextCurrent(window);
+    gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
+
+    //disable vsync
+    glfwSwapInterval(0);
+
+    //we have a context. Let's check if input is sane.
+    //calcualte buffer size, and make sure it's allowed by the driver.
+    const unsigned int pixelCount{(settings.imageWidth * bufferHeight)};
+    if(!settings.CheckValidity())
+    {
+        glfwTerminate();
+        return 1;
+    }
+
+    // Create and compile our GLSL program from the shaders
+    std::string vertexPath("Shaders/BuddhaVertex.glsl");
+    std::string fragmentPath("Shaders/BuddhaFragment.glsl");
+    std::string computePath("Shaders/BuddhaCompute.glsl");
+
+    if(!Helpers::DoesFileExist(vertexPath))
+    {
+#if defined _WIN32 || defined __CYGWIN__
+        std::string separator("\\");
+#else
+        std::string separator("/");
+#endif
+        vertexPath = INSTALL_PREFIX + separator + "share" + separator + "BuddhaShader" + separator + vertexPath;
+        fragmentPath = INSTALL_PREFIX + separator + "share" + separator + "BuddhaShader" + separator + fragmentPath;
+        computePath = INSTALL_PREFIX + separator + "share" + separator + "BuddhaShader" + separator + computePath;
+    }
+
+    GLuint VertexAndFragmentShaders = Helpers::LoadShaders(vertexPath, fragmentPath);
+    //Do the same for the compute shader:
+    GLuint ComputeShader = Helpers::LoadComputeShader(computePath, settings.localWorkgroupSizeX, settings.localWorkgroupSizeY, settings.localWorkgroupSizeZ);
+    if(VertexAndFragmentShaders == 0 || ComputeShader == 0)
+    {
+        std::cerr << "Something went wrong with loading the shaders. Abort." << std::endl;
+        glfwTerminate();
+        return 1;
+    }
+
+    GLuint VertexArrayID;
+    glGenVertexArrays(1, &VertexArrayID);
+    glBindVertexArray(VertexArrayID);
+
+    const GLfloat g_vertex_buffer_data[] = {
+        -1.0f, -1.0f, 0.0f,
+        1.0f, -1.0f, 0.0f,
+        -1.0f,  1.0f, 0.0f,
+        1.0f, 1.0f, 0.0f
+    };
+
+    GLuint vertexbuffer;
+    glGenBuffers(1, &vertexbuffer);
+    glBindBuffer(GL_ARRAY_BUFFER, vertexbuffer);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(g_vertex_buffer_data), g_vertex_buffer_data, GL_STATIC_DRAW);
+
+
+    GLuint drawBuffer[3];
+    glGenBuffers(3, drawBuffer);
+    for(int i=0; i < 3; ++i)
+    {
+        glBindBuffer(GL_SHADER_STORAGE_BUFFER, drawBuffer[i]);
+        {
+            glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * pixelCount, nullptr, GL_DYNAMIC_COPY);
+            glClearBufferData(GL_SHADER_STORAGE_BUFFER,GL_R8,GL_RED,GL_UNSIGNED_INT,nullptr);
+        }
+        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2+i, drawBuffer[i]);
+    }
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+
+    const uint32_t workersPerFrame = settings.globalWorkGroupSizeX*settings.globalWorkGroupSizeY*settings.globalWorkGroupSizeZ*settings.localWorkgroupSizeX*settings.localWorkgroupSizeY*settings.localWorkgroupSizeZ;
+    GLuint stateBuffer;
+    glGenBuffers(1,&stateBuffer);
+    glBindBuffer(GL_SHADER_STORAGE_BUFFER,stateBuffer);
+    glBufferData(GL_SHADER_STORAGE_BUFFER, 4*(5*workersPerFrame),nullptr,GL_DYNAMIC_COPY);
+    glClearBufferData(GL_SHADER_STORAGE_BUFFER,GL_R8,GL_RED,GL_UNSIGNED_INT,nullptr);
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 5, stateBuffer);
+
+    glUseProgram(ComputeShader);
+    GLint orbitLengthUniformHandle = glGetUniformLocation(ComputeShader, "orbitLength");
+    GLint widthUniformComputeHandle = glGetUniformLocation(ComputeShader, "width");
+    GLint heightUniformComputeHandle = glGetUniformLocation(ComputeShader, "height");
+    GLint iterationsPerDispatchHandle = glGetUniformLocation(ComputeShader, "iterationsPerDispatch");
+    glUniform3ui(orbitLengthUniformHandle,settings.orbitLengthRed,settings.orbitLengthGreen,settings.orbitLengthBlue);
+    glUniform1ui(widthUniformComputeHandle, settings.imageWidth);
+    glUniform1ui(heightUniformComputeHandle, bufferHeight);
+
+    glUseProgram(VertexAndFragmentShaders);
+    GLint widthUniformFragmentHandle = glGetUniformLocation(VertexAndFragmentShaders, "width");
+    GLint heightUniformFragmentHandle = glGetUniformLocation(VertexAndFragmentShaders, "height");
+    glUniform1ui(widthUniformFragmentHandle, settings.imageWidth);
+    glUniform1ui(heightUniformFragmentHandle, bufferHeight);
+    glClearColor(0.0f, 0.0f, 0.4f, 0.0f);
+
+    uint32_t iterationsPerFrame = 1;
+
+    Helpers::PIDController<float, std::chrono::high_resolution_clock::time_point::rep> pid{0.0f,0.0f,1e-4f};
+    const uint32_t targetFrameDuration{1000000/settings.targetFrameRate};
+
+    /* Loop until the user closes the window */
+    while (!glfwWindowShouldClose(window))
+    {
+        auto frameStart{std::chrono::high_resolution_clock::now()};
+        //let the compute shader do something
+        glUseProgram(ComputeShader);
+        glUniform1ui(iterationsPerDispatchHandle, iterationsPerFrame);
+        glDispatchCompute(settings.globalWorkGroupSizeX, settings.globalWorkGroupSizeY, settings.globalWorkGroupSizeZ);
+
+        //before reading the values in the ssbo, we need a memory barrier:
+        glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT); //I hope this is the correct (and only required) bit
+
+        /* Render here */
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        glUseProgram(VertexAndFragmentShaders);
+
+        glEnableVertexAttribArray(0);
+        glBindBuffer(GL_ARRAY_BUFFER, vertexbuffer);
+        glVertexAttribPointer(
+                    0,                  // attribute 0. No particular reason for 0, but must match the layout in the shader.
+                    3,                  // size
+                    GL_FLOAT,           // type
+                    GL_FALSE,           // normalized?
+                    0,                  // stride
+                    (void*)0            // array buffer offset
+                    );
+        // Draw the triangle strip!
+        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); // Triangle strip with 4 vertices -> quad.
+        glDisableVertexAttribArray(0);
+
+        /* Swap front and back buffers */
+        glfwSwapBuffers(window);
+
+        /* Poll for and process events */
+        glfwPollEvents();
+        auto frameStop{std::chrono::high_resolution_clock::now()};
+        const auto dur{std::chrono::duration_cast<std::chrono::microseconds>(frameStop-frameStart)};
+        auto frameDuration{dur.count()};
+        if(frameDuration > 0)
+        {
+            const auto error{targetFrameDuration - frameDuration};
+            const auto pidOutput{pid.Update(1,float(error))};
+            iterationsPerFrame = std::max(1,static_cast<int>(pidOutput));
+
+            //std::cout << iterationsPerFrame << " " << pidOutput << std::endl;
+        }
+    }
+
+    if(!settings.pngFilename.empty())
+    {
+        glMemoryBarrier(GL_ALL_BARRIER_BITS);
+        std::vector<std::vector<uint32_t>> readBackBuffers(3,std::vector<uint32_t>(pixelCount));
+        for(int i = 0; i < 3; ++i)
+        {
+            glBindBuffer(GL_SHADER_STORAGE_BUFFER, drawBuffer[i]);
+            glGetBufferSubData(GL_SHADER_STORAGE_BUFFER,0,4 * pixelCount,readBackBuffers[i].data());
+        }
+
+        //too lazy to change WriteOutputPng...
+        std::vector<uint32_t> combinedBuffer(3*pixelCount);
+        for(uint32_t i=0;i<3*pixelCount;++i)
+        {
+            combinedBuffer[i] = readBackBuffers[i%3][i/3];
+        }
+        Helpers::WriteOutputPNG(settings.pngFilename,combinedBuffer,settings.imageWidth,bufferHeight, settings.pngGamma, settings.pngColorScale);
+    }
+
+    //a bit of cleanup
+    glDeleteBuffers(1,&vertexbuffer);
+    glDeleteBuffers(3,drawBuffer);
+    glDeleteBuffers(1,&stateBuffer);
+
+    glfwTerminate();
+    return 0;
+}