Add build_full_glsl.bat

hunterashner · Apr 12, 2015 · 2434de9 · 2434de9
1 parent ad48349
commit 2434de9
Show file tree

Hide file tree

Showing 8 changed files with 640 additions and 264 deletions.
diff --git a/build_full _glsl.bat b/build_full _glsl.bat
@@ -0,0 +1,7 @@
+@echo off
+
+python.exe find_glsl.py
+python.exe read_glsl_spec.py
+python.exe compile_glsl.py --full
+
+pause
diff --git a/compile_glsl.py b/compile_glsl.py
@@ -155,7 +155,9 @@ def create_directory(dir):
 
   all_major_versions = glsl.get_major_versions(glsl.version_commands_flat.keys())
   for version in all_major_versions:
-    if int(version[2:3]) < 2:
+    if int(version[2:3]) < 3:
+      continue
+    if version == "sl3":
       continue
     alias = command
 
@@ -180,10 +182,10 @@ def create_directory(dir):
 search_versions_commands = "var search_versions = {"
 search_function_aliases = {}
 for version in glsl.version_commands:
-  if version[0:2] == "sl" and float(version[2:]) < 2.1:
+  if version[0:2] == "sl" and float(version[2:]) < 4.0:
     continue
 
-  if version[0:2] == "el" and float(version[2:]) < 2.0:
+  if version[0:2] == "el" and float(version[2:]) < 3.0:
     continue
 
   search_versions_commands += "'" + version + "':["
@@ -214,17 +216,16 @@ def create_directory(dir):
 for command in glsl.commands_version:
   major_versions = glsl.get_major_versions(glsl.commands_version[command])
   for version in major_versions:
-    if int(version[2]) < 2:
+    if int(version[2]) < 3:
       continue
     search_versions_commands += "'" + version[:3] + "/" + command + "',"
 
 for command in glsl.commands_version_flat:
   if command in glsl.commands_version:
     continue
-
   major_versions = glsl.get_major_versions(glsl.commands_version_flat[command])
   for version in major_versions:
-    if int(version[2]) < 2:
+    if int(version[2]) < 3:
       continue
     search_versions_commands += "'" + version[:3] + "/" + command + "',"
 
@@ -247,10 +248,10 @@ def create_directory(dir):
 
 search_versions_options = ""
 for version_option in glsl.version_commands.keys():
-  if version_option[0:2] == "sl" and float(version_option[2:]) < 2.1:
+  if version_option[0:2] == "sl" and float(version_option[2:]) < 4.0:
     continue
 
-  if version_option[0:2] == "el" and float(version_option[2:]) < 2.0:
+  if version_option[0:2] == "el" and float(version_option[2:]) < 3.0:
     continue
 
   if version_option[:2] == 'sl':
@@ -316,9 +317,11 @@ def spew_category(name, commands, current_command):
 major_versions = glsl.get_major_versions(glsl.version_commands.keys())
 
 for version in major_versions:
-  if int(version[2]) < 4:
+  if int(version[2]) < 3:
     continue
-
+  if version == 'sl3':
+    continue  
+
   written = 0
 
   print "Compiling " + version + " ..."
@@ -442,7 +445,6 @@ def spew_category(name, commands, current_command):
     version_dir = version
 
     create_directory(output_dir + version_dir)
-    print version + " " + command
     command_file = shared_glsl.find_command_file(version, command)
     if command_file == False:
       raise IOError("Couldn't find page for command " + command + " (" + version + ")")

diff --git a/es3/mod.xhtml b/es3/mod.xhtml
@@ -139,5 +139,3 @@
         </p>
       </div>
     </div>
-    <footer/>
-  </body>
diff --git a/glsl.py b/glsl.py
@@ -76,7 +76,7 @@ def generate_versions():
 
         if not command in version_commands_flat[version]:
           version_commands_flat[version].append(version_commands[version][command])
-
+  print version_commands
   commands_version = reverse_version_index(version_commands)
   commands_version_flat = reverse_version_index(version_commands_flat)
 

diff --git a/glsl_html/index.html b/glsl_html/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset='utf-8'>
-<title>glsl.docs.gl</title>
+<title>docs.gl</title>
 
 <link rel="shortcut icon" href="/favicon.ico" />
 {$jquery}
@@ -115,20 +115,20 @@
 <img src="logo-lg.png" /><br />
 GLSL API Documentation<br /><br /><br />
 <div id="buttonpanel">
-<div id="es_api" class="apibuttons">
+<div id="el_api" class="apibuttons">
 GLSL ES<br />
-<input type="radio" id="el20" name="api"><label for="el20">2.0</label>
+<!--<input type="radio" id="el10" name="api"><label for="el10">1.0</label>-->
 <input type="radio" id="el30" name="api"><label for="el30">3.0</label>
 <input type="radio" id="el31" name="api"><label for="el31">3.1</label>
 </div>
-<div id="gl_api" class="apibuttons">
+<div id="sl_api" class="apibuttons">
 GLSL<br />
-<input type="radio" id="sl11" name="api"><label for="sl11">1.1</label>
+<!--<input type="radio" id="sl11" name="api"><label for="sl11">1.1</label>
 <input type="radio" id="sl12" name="api"><label for="sl12">1.2</label>
 <input type="radio" id="sl13" name="api"><label for="sl13">1.3</label>
 <input type="radio" id="sl14" name="api"><label for="sl14">1.4</label>
 <input type="radio" id="sl15" name="api"><label for="sl15">1.5</label>
-<input type="radio" id="sl33" name="api"><label for="sl33">3.3</label>
+<input type="radio" id="sl33" name="api"><label for="sl33">3.3</label>-->
 <input type="radio" id="sl40" name="api"><label for="sl40">4.0</label>
 <input type="radio" id="sl41" name="api"><label for="sl41">4.1</label>
 <input type="radio" id="sl42" name="api"><label for="sl42">4.2</label>
-Original file line number
+Diff line change
@@ Expand Up / @@ -139,5 +139,3 @@ @@
             </p>
           </div>
         </div>
-        <footer/>
-      </body>