1 files changed, 29 insertions, 16 deletions

diff --git a/BuddhaTest/src/BuddhaTest.cpp b/BuddhaTest/src/BuddhaTest.cpp
index 5d03ad4..24f5893 100644
--- a/BuddhaTest/src/BuddhaTest.cpp
+++ b/BuddhaTest/src/BuddhaTest.cpp
@@ -3,6 +3,7 @@
 #include <Helpers.h>

 #include <iostream>

 #include <vector>

+#include <chrono>

 

 void error_callback(int error, const char* description)

 {

@@ -122,12 +123,19 @@ int main(int argc, char * argv[])
     }

     glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);

 

-    uint32_t iterationCount{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*(7*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 iterationCountUniformHandle = glGetUniformLocation(ComputeShader, "iterationCount");

     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);

@@ -137,27 +145,20 @@ int main(int argc, char * argv[])
     GLint heightUniformFragmentHandle = glGetUniformLocation(VertexAndFragmentShaders, "height");

     glUniform1ui(widthUniformFragmentHandle, settings.imageWidth);

     glUniform1ui(heightUniformFragmentHandle, bufferHeight);

-

     glClearColor(0.0f, 0.0f, 0.4f, 0.0f);

 

-    //uint32_t iterationsPerFrame = settings.globalWorkGroupSizeX*settings.globalWorkGroupSizeY*settings.globalWorkGroupSizeZ*settings.localWorkgroupSizeX*settings.localWorkgroupSizeY*settings.localWorkgroupSizeZ;

-    //bool bWarningShown{false};

+    uint32_t iterationsPerFrame = 1;

+

+    Helpers::PIDController<float, uint32_t> pid{0.0f,0.0f,1e-8f};

+    const uint32_t targetFrameDuration{1000000/settings.targetFrameRate};

 

 	/* Loop until the user closes the window */

 	while (!glfwWindowShouldClose(window))

 	{

-        //commented out, as with the new y-decoupling we will get more points in 2D even after we had all integer values for x.

-        //check if we are "done"

-        //if(iterationsPerFrame * iterationCount <= iterationsPerFrame && iterationCount > 1 && !bWarningShown)

-        //{

-        //    std::cout << "The program covered all possible integer values for starting point computation. Leaving it running will not improve the image any more." << std::endl;

-        //    bWarningShown = true;

-        //}

-

+        auto frameStart{std::chrono::high_resolution_clock::now()};

 		//let the compute shader do something

-		glUseProgram(ComputeShader);

-        //increase iterationCount, which is used for pseudo random generation

-        glUniform1ui(iterationCountUniformHandle,++iterationCount);

+        glUseProgram(ComputeShader);

+        glUniform1ui(iterationsPerDispatchHandle, iterationsPerFrame);

         glDispatchCompute(settings.globalWorkGroupSizeX, settings.globalWorkGroupSizeY, settings.globalWorkGroupSizeZ);

 

         //before reading the values in the ssbo, we need a memory barrier:

@@ -186,6 +187,17 @@ int main(int argc, char * argv[])
 

 		/* 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(frameDuration,error)};

+            iterationsPerFrame = std::max(1,static_cast<int>(pidOutput));

+

+            //std::cout << iterationsPerFrame << " " << pidOutput << std::endl;

+        }

 	}

 

     if(!settings.pngFilename.empty())

@@ -210,6 +222,7 @@ int main(int argc, char * argv[])
     //a bit of cleanup

     glDeleteBuffers(1,&vertexbuffer);

     glDeleteBuffers(3,drawBuffer);

+    glDeleteBuffers(1,&stateBuffer);

 

 	glfwTerminate();

 	return 0;