aboutsummaryrefslogtreecommitdiff
path: root/BuddhaTest
diff options
context:
space:
mode:
Diffstat (limited to 'BuddhaTest')
-rw-r--r--BuddhaTest/Shaders/BuddhaCompute.glsl71
-rw-r--r--BuddhaTest/src/BuddhaTest.cpp4
2 files changed, 59 insertions, 16 deletions
diff --git a/BuddhaTest/Shaders/BuddhaCompute.glsl b/BuddhaTest/Shaders/BuddhaCompute.glsl
index 6933c7d..937f087 100644
--- a/BuddhaTest/Shaders/BuddhaCompute.glsl
+++ b/BuddhaTest/Shaders/BuddhaCompute.glsl
@@ -14,7 +14,7 @@ layout(std430, binding=3) restrict buffer brightnessData
layout(std430, binding=4) restrict buffer importanceMapBufferBlock
{
- restrict uint importanceMap[];
+ restrict uint importanceMap[5000]; //100*50
};
/** Data stored in the state buffer. */
@@ -23,7 +23,9 @@ struct individualData
uint phase;
uint orbitNumber;
uint doneIterations;
+ uint scale;
vec2 lastPosition;
+ vec2 offset;
};
layout(packed, binding=5) restrict buffer statusBuffer
@@ -49,6 +51,8 @@ struct workerState
/** Storage in shared memory. Used to reduce register pressure. */
shared workerState[gl_WorkGroupSize.x*gl_WorkGroupSize.y*gl_WorkGroupSize.z] localStore;
+shared uint maxImportance;
+shared uint importanceMapCache[5000]; //100*50
void uintMaxIP(inout uint modified, const uint constant)
{
@@ -63,13 +67,17 @@ void uintMaxIP(inout uvec3 modified, const uvec3 constant)
void addToImportanceMap(vec2 orbitParameter)
{
- //as starting point values are in x [-2:2] and y [0:2], importance map has an aspect ratio of 2:1
- float width = sqrt(float(2*(importanceMap.length() - 1)));
+ //as starting point values are in [-2:2], importance map has an aspect ratio of 2:1, as it is symmetric around x-axis.
+ //float width = sqrt(float(2*(importanceMap.length() - 1)));
//float height = 0.5*width;
- orbitParameter *= vec2(0.25,0.5);
- orbitParameter.x += 0.5;
+ vec2 scaled = orbitParameter;
+ scaled.y = abs(orbitParameter.y);
+ scaled *= vec2(0.25,0.5);
+ scaled.x += 0.5;
//now both components are between 0 and 1
-
+ uint xc = uint(clamp(scaled.x*100.0,0.0,100.0));
+ uint yc = uint(clamp(scaled.y*50.0,0.0,50.0));
+ atomicAdd(importanceMapCache[xc+100*yc],1);
}
void addToColorOfCell(uvec2 cell, uvec3 toAdd)
@@ -242,7 +250,7 @@ bool isGoingToBeDrawn(in vec2 offset, in uint totalIterations, inout vec2 lastVa
return endCount == totalIterations;
}
-bool drawOrbit(in vec2 offset, in uint totalIterations, inout vec2 lastVal, inout uint iterationsLeftThisFrame, inout uint doneIterations)
+bool drawOrbit(in vec2 offset, in uint totalIterations, in uint scale, inout vec2 lastVal, inout uint iterationsLeftThisFrame, inout uint doneIterations)
{
uint endCount = doneIterations + iterationsLeftThisFrame > totalIterations ? totalIterations : doneIterations + iterationsLeftThisFrame;
for(uint i = doneIterations; i < endCount;++i)
@@ -256,7 +264,8 @@ bool drawOrbit(in vec2 offset, in uint totalIterations, inout vec2 lastVal, inou
}
if(lastVal.x > imageRange[0] && lastVal.x < imageRange[2] && lastVal.y > imageRange[1] && lastVal.y < imageRange[3])
{
- addToColorAt(lastVal,uvec3(i < orbitLength.r,i < orbitLength.g,i < orbitLength.b));
+ addToColorAt(lastVal,scale*uvec3(i < orbitLength.r,i < orbitLength.g,i < orbitLength.b));
+ addToImportanceMap(offset);
}
}
iterationsLeftThisFrame -= (endCount - doneIterations);
@@ -264,18 +273,52 @@ bool drawOrbit(in vec2 offset, in uint totalIterations, inout vec2 lastVal, inou
return endCount == totalIterations;
}
-vec2 getCurrentOrbitOffset(const uint orbitNumber, const uint totalWorkers, const uint uniqueWorkerID)
+vec2 getCurrentOrbitOffset(const uint orbitNumber, const uint totalWorkers, const uint uniqueWorkerID, out uint scale)
{
uint seed = orbitNumber * totalWorkers + uniqueWorkerID;
float x = hash1(seed,seed);
seed = (seed ^ (intHash(orbitNumber+totalWorkers)));
float y = hash1(seed,seed);
vec2 random = vec2(x,y);
+
+ scale = 1;
return vec2(random.x * 4-2,random.y*4-2);
}
+void initImportanceMapCache()
+{
+ if(gl_LocalInvocationIndex == 0)
+ {
+ maxImportance = 0;
+ }
+ barrier();
+ for(uint i = 0; i < importanceMapCache.length(); i += gl_WorkGroupSize.x*gl_WorkGroupSize.y*gl_WorkGroupSize.z)
+ {
+ if(i+gl_LocalInvocationIndex < importanceMapCache.length())
+ {
+ importanceMapCache[i+gl_LocalInvocationIndex] = 0;
+ atomicMax(maxImportance,importanceMap[i+gl_LocalInvocationIndex]);
+ }
+ }
+ barrier();
+}
+
+void writeBackImportanceMapCache()
+{
+ barrier();
+ for(uint i = 0; i < importanceMapCache.length(); i += gl_WorkGroupSize.x*gl_WorkGroupSize.y*gl_WorkGroupSize.z)
+ {
+ if(i+gl_LocalInvocationIndex < importanceMapCache.length())
+ {
+ atomicAdd(importanceMap[i+gl_LocalInvocationIndex],importanceMapCache[i+gl_LocalInvocationIndex]);
+ }
+ }
+ barrier();
+}
+
void main() {
localStore[gl_LocalInvocationIndex].brightness = 0;
+ initImportanceMapCache();
//we need to know how many total work groups are running this iteration
const uvec3 totalWorkersPerDimension = gl_WorkGroupSize * gl_NumWorkGroups;
@@ -287,7 +330,6 @@ void main() {
//getIndividualState(in uint CellID, out vec2 offset, out vec2 coordinates, out uint phase, out uint orbitNumber, out uint doneIterations)
uint iterationsLeftToDo = iterationsPerDispatch;
- vec2 offset = getCurrentOrbitOffset(state.orbitNumber, totalWorkers, uniqueWorkerID);
while(iterationsLeftToDo != 0)
{
@@ -296,8 +338,8 @@ void main() {
//new orbit:
//we know that iterationsLeftToDo is at least 1 by the while condition.
--iterationsLeftToDo; //count this as 1 iteration.
- offset = getCurrentOrbitOffset(state.orbitNumber, totalWorkers, uniqueWorkerID);
- if(isInMainCardioid(offset) || isInKnownCircle(offset))
+ state.offset = getCurrentOrbitOffset(state.orbitNumber, totalWorkers, uniqueWorkerID, state.scale);
+ if(isInMainCardioid(state.offset) || isInKnownCircle(state.offset))
{
// do not waste time drawing this orbit
++state.orbitNumber;
@@ -314,7 +356,7 @@ void main() {
{
//check if this orbit is going to be drawn
bool result;
- if(isGoingToBeDrawn(offset,totalIterations, state.lastPosition, iterationsLeftToDo, state.doneIterations , result))
+ if(isGoingToBeDrawn(state.offset,totalIterations, state.lastPosition, iterationsLeftToDo, state.doneIterations , result))
{
if(result)
{
@@ -333,7 +375,7 @@ void main() {
}
if(state.phase == 2)
{
- if(drawOrbit(offset, totalIterations, state.lastPosition, iterationsLeftToDo, state.doneIterations))
+ if(drawOrbit(state.offset, totalIterations, state.scale, state.lastPosition, iterationsLeftToDo, state.doneIterations))
{
++state.orbitNumber;
state.phase = 0;
@@ -343,6 +385,7 @@ void main() {
stateArray[uniqueWorkerID] = state;
+ writeBackImportanceMapCache();
//use divide et impera to get the real maximum brightness of this local group
barrier();
diff --git a/BuddhaTest/src/BuddhaTest.cpp b/BuddhaTest/src/BuddhaTest.cpp
index ac7cebe..cc6bc83 100644
--- a/BuddhaTest/src/BuddhaTest.cpp
+++ b/BuddhaTest/src/BuddhaTest.cpp
@@ -127,9 +127,9 @@ int main(int argc, char * argv[])
GLuint importanceMapBuffer;
glGenBuffers(1,&importanceMapBuffer);
glBindBuffer(GL_SHADER_STORAGE_BUFFER,importanceMapBuffer);
- glBufferData(GL_SHADER_STORAGE_BUFFER,4*8193,nullptr, GL_DYNAMIC_COPY); //128*64+1. one larger than the map itself -> max brightness. Aspect 2:1 because mandel is symmetric around x
+ glBufferData(GL_SHADER_STORAGE_BUFFER,4*(100*50),nullptr, GL_DYNAMIC_COPY); //100*50 pixels. Map is symmetric around x-axis. This size is *hardcoded* in the shader!
glClearBufferData(GL_SHADER_STORAGE_BUFFER,GL_R8,GL_RED,GL_UNSIGNED_INT,nullptr);
- glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, brightnessBuffer);
+ glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, importanceMapBuffer);
//the state buffer is special. While making each entry 8 bytes large and using std430 layout, the data is never read back,
//so we can get away with being more lenient and allowing the compiler to choose layout without much extra work.
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-25 05:53:51 +0000