Fixed ATI bug with Bill's 4D rank ordering

benchmark/Makefile

@@ -21,7 +21,7 @@ MacOSX:
 
 Win32:
 	cd common && $(WINMAKE)
-	cd $@ && $(WINMAKE) && $(WINMAKE)
+	cd $@ && $(WINMAKE) && $(WINMAKE) run
 
 clean-Win32:
 	cd common && $(WINMAKE) clean

benchmark/common/Makefile

@@ -1,4 +1,4 @@
-OPTIONS=-DNORMALISE_GRADIENTS
+OPTIONS=-DNORMALISE_GRADIENTS -DCOLLAPSE_SORTNET
 SRCDIR=../../src
 COMMON=commonShader.frag $(SRCDIR)/noiseStdLib.glsl
 SHADERS=GLSL-ashimanoise2D.frag GLSL-ashimanoise3D.frag \

src/noise4D.glsl

@@ -31,10 +31,8 @@ float simplexNoise(vec4 v)
 
 // Other corners
 
-#if (0)
+#ifdef COLLAPSE_SORTNET
   // Rank sorting by Bill Licea-Kane, AMD (formerly ATI).
-  // BUG: This works fine om Nvidia hardware, but ironically,
-  // on ATI-AMD hardware the sorting is messed up. Why?
   vec4 i0;
 
   vec3 isX = step( x0.yzw, x0.xxx );