Move buffer dimensions out of buffer into uniforms. No longer odd -2

everywhere.

3 files changed, 23 insertions, 15 deletions

diff --git a/BuddhaTest/Shaders/BuddhaCompute.glsl b/BuddhaTest/Shaders/BuddhaCompute.glsl
index ddbaf93..458a4e3 100644
--- a/BuddhaTest/Shaders/BuddhaCompute.glsl
+++ b/BuddhaTest/Shaders/BuddhaCompute.glsl
@@ -4,13 +4,13 @@
 

 layout(std430, binding=2) buffer renderedData

 {

-        uint width;

-        uint height;

         uint counts_SSBO[];

 };

 

-uniform uint iterationCount;

+uniform uint width;

+uniform uint height;

 

+uniform uint iterationCount;

 uniform uvec3 orbitLength;

 

 void addToColorOfCell(uvec2 cell, uvec3 toAdd)

diff --git a/BuddhaTest/Shaders/BuddhaFragment.glsl b/BuddhaTest/Shaders/BuddhaFragment.glsl
index cb09628..9ef64b8 100644
--- a/BuddhaTest/Shaders/BuddhaFragment.glsl
+++ b/BuddhaTest/Shaders/BuddhaFragment.glsl
@@ -6,11 +6,12 @@ out vec3 color;
 

 layout(std430, binding=2) buffer renderedData

 {

-        uint width;

-        uint height;

         uint counts_SSBO[];

 };

 

+uniform uint width;

+uniform uint height;

+

 uvec3 getColorAt(vec2 fragCoord)

 {

     uint xIndex = uint(max(0.0,(fragCoord.x+1.0)*0.5*width));

diff --git a/BuddhaTest/src/BuddhaTest.cpp b/BuddhaTest/src/BuddhaTest.cpp
index 32bd927..74bdc80 100644
--- a/BuddhaTest/src/BuddhaTest.cpp
+++ b/BuddhaTest/src/BuddhaTest.cpp
@@ -11,8 +11,8 @@ void error_callback(int error, const char* description)
 

 int main()

 {

-    unsigned int bufferWidth = 1920;

-    unsigned int bufferHeight = 540;

+    unsigned int bufferWidth = 6304;

+    unsigned int bufferHeight = 1773;

 

     unsigned int windowWidth = 1600;

     unsigned int windowHeight = 900;

@@ -60,13 +60,12 @@ int main()
     //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{(bufferWidth * bufferHeight)*3}; //*3 -> RGB

-    const unsigned int integerCount = pixelCount + 2; //first two elements in buffer: width/height.

     {

         int maxSSBOSize;

         glGetIntegerv(GL_MAX_SHADER_STORAGE_BLOCK_SIZE,&maxSSBOSize);

-        if(integerCount * 4 > maxSSBOSize)

+        if(pixelCount * 4 > maxSSBOSize)

         {

-            std::cout << "Requested buffer size larger than maximum allowed by graphics driver. Max pixel number: " << maxSSBOSize/12 - 2 << std::endl;

+            std::cout << "Requested buffer size larger than maximum allowed by graphics driver. Max pixel number: " << maxSSBOSize/12 << std::endl;

             glfwTerminate();

             return 0;

         }

@@ -121,10 +120,8 @@ int main()
 	glGenBuffers(1, &drawBuffer);

 	glBindBuffer(GL_SHADER_STORAGE_BUFFER, drawBuffer);

     {

-        std::vector<uint32_t> initializeBuffer(integerCount,0);

-        initializeBuffer[0] = bufferWidth;

-        initializeBuffer[1] = bufferHeight;

-        glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * integerCount, initializeBuffer.data(), GL_DYNAMIC_COPY);

+        std::vector<uint32_t> initializeBuffer(pixelCount,0);

+        glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * pixelCount, initializeBuffer.data(), GL_DYNAMIC_COPY);

     }

 	glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, drawBuffer);

 	glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);

@@ -138,7 +135,17 @@ int main()
     glUseProgram(ComputeShader);

     GLint iterationCountUniformHandle = glGetUniformLocation(ComputeShader, "iterationCount");

     GLint orbitLengthUniformHandle = glGetUniformLocation(ComputeShader, "orbitLength");

+    GLint widthUniformComputeHandle = glGetUniformLocation(ComputeShader, "width");

+    GLint heightUniformComputeHandle = glGetUniformLocation(ComputeShader, "height");

     glUniform3ui(orbitLengthUniformHandle,orbitLengthRed,orbitLengthGreen,orbitLengthBlue);

+    glUniform1ui(widthUniformComputeHandle, bufferWidth);

+    glUniform1ui(heightUniformComputeHandle,bufferHeight);

+

+    glUseProgram(VertexAndFragmentShaders);

+    GLint widthUniformFragmentHandle = glGetUniformLocation(VertexAndFragmentShaders, "width");

+    GLint heightUniformFragmentHandle = glGetUniformLocation(VertexAndFragmentShaders, "height");

+    glUniform1ui(widthUniformFragmentHandle, bufferWidth);

+    glUniform1ui(heightUniformFragmentHandle,bufferHeight);

 

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

 

@@ -183,7 +190,7 @@ int main()
     glBindBuffer(GL_SHADER_STORAGE_BUFFER, drawBuffer);

     {

         std::vector<uint32_t> readBackBuffer(pixelCount);

-        glGetBufferSubData(GL_SHADER_STORAGE_BUFFER,4*2,4 * pixelCount,readBackBuffer.data()); //offset of 2*4, that's the dimension integers.

+        glGetBufferSubData(GL_SHADER_STORAGE_BUFFER,0,4 * pixelCount,readBackBuffer.data());

         Helpers::WriteOutputPNG(readBackBuffer,bufferWidth,bufferHeight, pngGamma, pngColorScale);

     }