ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add -quiet and -I to cg2glsl. 

Fixes cases where #include is used.
This commit is contained in:
Themaister 2013-10-07 22:50:48 +02:00
parent 7f7b5b1f7b
commit fa39a1ec39
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/cg2glsl.py
View File

@ -546,7 +546,7 @@ def preprocess_vertex(source_data):
return '\n'.join(ret) return '\n'.join(ret)
def convert(source, dest): 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: with open(source, 'r') as f:
source_data = f.read() source_data = f.read()
p = subprocess.Popen(vert_cmd, stdin = subprocess.PIPE, stderr = subprocess.PIPE, stdout = subprocess.PIPE) 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 ...') log('Vertex compilation failed ...')
return 1 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) p = subprocess.Popen(frag_cmd, stderr = subprocess.PIPE, stdout = subprocess.PIPE)
fragment_source, stderr_ret = p.communicate() fragment_source, stderr_ret = p.communicate()
log(stderr_ret.decode()) log(stderr_ret.decode())