Restructured bounds checks to avoid some performance issues

ngscopeclient · Nov 26, 2021 · 1f47d35 · 1f47d35
1 parent 93bc3fb
commit 1f47d35
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/glscopeclient/shaders/waveform-compute-core.glsl b/src/glscopeclient/shaders/waveform-compute-core.glsl
@@ -132,8 +132,10 @@ void main()
 				#endif
 
 				//Clip to window size
-				starty = min(starty, MAX_HEIGHT-1);
-				endy = min(endy, MAX_HEIGHT-1);
+				starty = min(starty, MAX_HEIGHT - 1);
+				endy = min(endy, MAX_HEIGHT - 1);
+				starty = max(starty, 0);
+				endy = max(endy, 0);
 
 				//Sort Y coordinates from min to max
 				g_blockmin[gl_LocalInvocationID.y] = int(min(starty, endy));
@@ -165,8 +167,6 @@ void main()
 			{
 				//Parallel fill
 				int ymin = g_blockmin[y];
-				if(ymin < 0)
-					ymin = 0;
 				int len = g_blockmax[y] - ymin;
 				for(uint y=gl_LocalInvocationID.y; y <= len; y += ROWS_PER_BLOCK)
 				{