From d7c1957586a5759ffd1de02e025d747b18a2e51e Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Thu, 11 Apr 2013 15:33:10 +0200
Subject: [PATCH] Rename cg2xml to cg2glsl.

Outputs CGP/GLSL style shaders now.
---
 tools/{cg2xml.py => cg2glsl.py} | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)
 rename tools/{cg2xml.py => cg2glsl.py} (95%)

diff --git a/tools/cg2xml.py b/tools/cg2glsl.py
similarity index 95%
rename from tools/cg2xml.py
rename to tools/cg2glsl.py
index 87b7d8ec0b..32261e5408 100755
--- a/tools/cg2xml.py
+++ b/tools/cg2glsl.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-Python 3 script which converts simple RetroArch Cg shaders to modern XML/GLSL format.
+Python 3 script which converts simple RetroArch Cg shaders to modern GLSL (ES) format.
 Author: Hans-Kristian Arntzen (Themaister)
 License: Public domain
 """
@@ -279,29 +279,19 @@ def convert(source, dest):
       return 1
 
    with open(dest, 'w') as f:
-      f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
-      f.write('<!-- XML/GLSL shader autogenerated by cg2xml.py -->\n')
-      f.write('<shader language="GLSL" style="GLES2">\n')
-      f.write('    <vertex><![CDATA[\n')
-
+      f.write('// GLSL shader autogenerated by cg2glsl.py.\n')
+      f.write('#if defined(VERTEX)\n')
       f.write(out_vertex)
       f.write('\n')
-
-      f.write(' ]]></vertex>\n')
-
-      f.write('    <fragment><![CDATA[\n')
-
+      f.write('#elif defined(FRAGMENT)\n')
       f.write(out_fragment)
       f.write('\n')
-
-      f.write(' ]]></fragment>\n')
-      f.write('</shader>\n')
-
+      f.write('#endif\n')
    return 0
 
 def main():
    if len(sys.argv) != 3:
-      print('Usage: {} prog.cg prog.shader'.format(sys.argv[0]))
+      print('Usage: {} prog.cg prog.glsl'.format(sys.argv[0]))
       print('Batch mode usage: {} cg-dir out-xml-shader-dir'.format(sys.argv[0]))
       return 1
 
@@ -320,7 +310,7 @@ def main():
       for dirname, _, filenames in os.walk(sys.argv[1]):
          for source in filter(lambda path: 'cg' == path.split('.')[-1], [os.path.join(dirname, filename) for filename in filenames]):
 
-            dest = os.path.join(sys.argv[2], source.replace(sys.argv[1], '')[1:]).replace('.cg', '.shader')
+            dest = os.path.join(sys.argv[2], source.replace(sys.argv[1], '')[1:]).replace('.cg', '.glsl')
             dirpath = os.path.split(dest)[0]
             print('Dirpath:', dirpath)
             if not os.path.isdir(dirpath):