Update Category

FangNotFish · May 2, 2015 · a428d70 · a428d70
1 parent 6da7642
commit a428d70
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/compile.py b/compile.py
@@ -576,19 +576,20 @@ def spew_category(name, commands, current_command, api):
     latest_present = versions_available[-1][0:3]
 
     commands_list += "<li><a class='rewritelink " + classes + "'>" + command + "</a></li>"
-
-    if commands != unhandled_commands:
-      try:
-        unhandled_commands.remove(command)
-      except:
-        pass
-
-    if commands != glsl_unhandled_commands:
-      try:
-        glsl_unhandled_commands.remove(command)
-      except:
-        pass
-
+    if api == "gl": 
+        if commands != unhandled_commands:
+            try:
+                unhandled_commands.remove(command)
+            except:
+                pass
+
+    if api == "sl":
+        if commands != glsl_unhandled_commands:
+            try:
+                glsl_unhandled_commands.remove(command)
+            except:
+                pass
+
   classes = "category"
   if found_current_command:
     classes += " open_me"

diff --git a/glsl.py b/glsl.py
@@ -151,7 +151,7 @@ def generate_versions():
   ( "Common", [
     "abs", "sign", "floor", "trunc", "round", "roundEven", "ceil", "floor", "fract", "mod", "modf", "min", "max", "clamp", "mix", "step", "smoothstep", "isnan", "isinf", "floatBitsToInt",  "intBitsToFloat", "fma", "frexp", "ldexp"
   ] ),  
-  ( "Floating-Point Pack/Unpack", [
+  ( "Floating-Point Packing", [
     "packDouble2x32","packHalf2x16","packUnorm","unpackDouble2x32","unpackHalf2x16","unpackUnorm"
   ] ),  
   ( "Built-In Variables", [
@@ -175,31 +175,28 @@ def generate_versions():
   ( "Integer", [
     'umulExtended', 'bitfieldExtract', 'bitfieldInsert', 'bitfieldReverse', 'bitCount', 'findLSB', 'findMSB'
   ] ),
-  ( "Texture", [
+  ( "Texture Sampling", [
     'texture', 'textureGather', 'textureGatherOffset', 'textureGatherOffsets', 'textureGrad', 'textureGradOffset', 'textureLod', 'textureLodOffset', 'textureOffset', 'textureProj', 'textureProjGrad', 'textureProjGradOffset', 'textureProjLod', 'textureProjLodOffset', 'textureProjOffset', 'textureQueryLevels', 'textureQueryLod', 'textureSamples', 'textureSize'
   ] ),
   ( "Memory Barrier", [
-    'memoryBarrier', 'memoryBarrierAtomicCounter', 'memoryBarrierBuffer', 'memoryBarrierImage'
-  ] ),  
+    'barrier', 'memoryBarrier', 'memoryBarrierAtomicCounter', 'memoryBarrierBuffer', 'memoryBarrierImage', 'groupMemoryBarrier'
+  ] ),
+  ( "Matrix", [
+    'determinant', 'inverse', 'outerProduct', 'transpose', 'matrixCompMult'
+  ] ),    
 ])
 
 # Functions left to categorize
 
-#barrier
 #dFdx
-#determinant
 #floatBitsToint
 #fwidth
-#groupMemoryBarrier
 #interpolateAtCentroid
 #interpolateAtOffset
 #interpolateAtSample
-#inverse
-#matrixCompMult
 #outerProduct
 #texelFetch
 #texelFetchOffset
-#transpose
 #uaddCarry
 #usubBorrow