From fa39a1ec39b9f8610f37223c470bb14a8780c73b Mon Sep 17 00:00:00 2001 From: Themaister Date: Mon, 7 Oct 2013 22:50:48 +0200 Subject: [PATCH] Add -quiet and -I to cg2glsl. Fixes cases where #include is used. --- tools/cg2glsl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cg2glsl.py b/tools/cg2glsl.py index 138b1d2cd6..ee8f1ce74c 100755 --- a/tools/cg2glsl.py +++ b/tools/cg2glsl.py @@ -546,7 +546,7 @@ def preprocess_vertex(source_data): return '\n'.join(ret) def convert(source, dest): - vert_cmd = ['cgc', '-profile', 'glesv', '-entry', 'main_vertex'] + vert_cmd = ['cgc', '-profile', 'glesv', '-entry', 'main_vertex', '-quiet', '-I', os.path.split(source)[0]] with open(source, 'r') as f: source_data = f.read() p = subprocess.Popen(vert_cmd, stdin = subprocess.PIPE, stderr = subprocess.PIPE, stdout = subprocess.PIPE) @@ -559,7 +559,7 @@ def convert(source, dest): log('Vertex compilation failed ...') return 1 - frag_cmd = ['cgc', '-profile', 'glesf', '-entry', 'main_fragment', source] + frag_cmd = ['cgc', '-profile', 'glesf', '-entry', 'main_fragment', '-quiet', source] p = subprocess.Popen(frag_cmd, stderr = subprocess.PIPE, stdout = subprocess.PIPE) fragment_source, stderr_ret = p.communicate() log(stderr_ret.decode())