summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2015-09-05 14:26:09 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2015-09-05 14:26:12 -0700
commit2c3b3d3a0cb02e9660283e70d323edc1db5b268b (patch)
tree5d4afea346661ac3d6727159746a17a4ff09d720 /misc
parent223661c47217561694ec84486871b6dc445171b3 (diff)
misc/glsl_scraper: Don't handle exceptions gracefully
It used to be that, of glslang couldn't compile a shader, we would gracefully fall back to glsl. However, since we no longer support GLSL in our driver, this isn't really an option anymore. Therefore, it makes no sense to handle these errors gracefully and we should instead let the test author know that we can't compile it.
Diffstat (limited to 'misc')
-rw-r--r--misc/glsl_scraper.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/misc/glsl_scraper.py b/misc/glsl_scraper.py
index f2aa9b6..85ed20f 100644
--- a/misc/glsl_scraper.py
+++ b/misc/glsl_scraper.py
@@ -253,15 +253,7 @@ with open_file(infname, 'r') as infile:
if not glsl_only:
for shader in parser.shaders:
- try:
- shader.compile()
- except ShaderCompileError:
- # If any compile fails, we set glsl_only and bail. This way
- # the entire fill will either support SPIR-V or not. If we did
- # it per-shader, then we could have problems with linking a
- # pipeline that's half GLSL and half SPIR-V.
- glsl_only = True
- break
+ shader.compile()
with open_file(outfname, 'w') as outfile:
outfile.write(dedent("""\