diff options
author | Connor Abbott <cwabbott0@gmail.com> | 2017-06-08 14:18:39 -0700 |
---|---|---|
committer | Connor Abbott <cwabbott0@gmail.com> | 2017-06-08 14:26:53 -0700 |
commit | 06c9c23c53be54f9d65874f417db1cb555bfa694 (patch) | |
tree | 5c8843a138bb4933993c49f75d71b748941ad31b | |
parent | 4d73e835f9300b177e97fda46a51fe340d088741 (diff) |
glsl_scraper: make shaders use version 4.50
For whatever reason, glslang requires GLSL 4.50 for enabling
GL_ARB_shader_ballot, even though it doesn't have any version
requirement. And GL_ARB_gpu_shader_int64 does officially require GLSL
4.00, which means that int64 tests will need to use at least that
version. Bumping the version for all shaders will add a bunch of
capabilities like tesselation that are unneeded for a bunch of tests,
though. Sigh :/
-rw-r--r-- | misc/glsl_scraper.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/glsl_scraper.py b/misc/glsl_scraper.py index 4534555..efb08ac 100644 --- a/misc/glsl_scraper.py +++ b/misc/glsl_scraper.py @@ -48,7 +48,7 @@ class Shader: assert False with subprocess.Popen([glslc] + extra_args + - [stage_flag, '-std=430core', '-o', '-', '-'], + [stage_flag, '-std=450core', '-o', '-', '-'], stdout = subprocess.PIPE, stderr = subprocess.PIPE, stdin = subprocess.PIPE) as proc: @@ -82,7 +82,7 @@ class Shader: # First dump the GLSL source as strings f.write('static const char {0}[] ='.format(var_name)) f.write('\n__QO_SPIRV_' + self.stage) - f.write('\n"#version 330\\n"') + f.write('\n"#version 450\\n"') for line in self.glsl_source().splitlines(): if not line.strip(): continue |