diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-08-21 14:44:14 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-08-21 14:44:14 -0700 |
| commit | 2fe32ddb90369a2d766e74eac189d72603cee4c1 (patch) | |
| tree | 759c2667b3e2db5c055c7321bccc2b3835f68b96 | |
| parent | f32df0eaee4ca46037de062e74eadcf73500c2ab (diff) | |
glsl_scraper: Finalize the stream in finish_text()
| -rw-r--r-- | misc/glsl_scraper.py | 10 | ||||
| -rw-r--r-- | src/tests/func/sync/semaphore-fd.c | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/misc/glsl_scraper.py b/misc/glsl_scraper.py index 4534555..83b2087 100644 --- a/misc/glsl_scraper.py +++ b/misc/glsl_scraper.py @@ -17,6 +17,7 @@ class ShaderCompileError(RuntimeError): class Shader: def __init__(self, stage): + self.glsl = None self.stream = io.StringIO() self.stage = stage self.dwords = None @@ -25,11 +26,10 @@ class Shader: self.stream.write(s) def finish_text(self, line): + self.glsl = self.stream.getvalue() + self.stream = None self.line = line - def glsl_source(self): - return dedent(self.stream.getvalue()) - def __run_glslc(self, extra_args=[]): stage_flag = '-fshader-stage=' if self.stage == 'VERTEX': @@ -53,7 +53,7 @@ class Shader: stderr = subprocess.PIPE, stdin = subprocess.PIPE) as proc: - proc.stdin.write(self.glsl_source().encode('utf-8')) + proc.stdin.write(self.glsl.encode('utf-8')) out, err = proc.communicate(timeout=30) if proc.returncode != 0: @@ -83,7 +83,7 @@ class Shader: f.write('static const char {0}[] ='.format(var_name)) f.write('\n__QO_SPIRV_' + self.stage) f.write('\n"#version 330\\n"') - for line in self.glsl_source().splitlines(): + for line in self.glsl.splitlines(): if not line.strip(): continue f.write('\n"{0}\\n"'.format(line)) diff --git a/src/tests/func/sync/semaphore-fd.c b/src/tests/func/sync/semaphore-fd.c index d1bb50b..69e56c2 100644 --- a/src/tests/func/sync/semaphore-fd.c +++ b/src/tests/func/sync/semaphore-fd.c @@ -656,8 +656,10 @@ static void test_opaque_fd(void) { t_require_ext("VK_KHR_external_memory"); + t_require_ext("VK_KHR_external_memory_capabilities"); t_require_ext("VK_KHR_external_memory_fd"); t_require_ext("VK_KHR_external_semaphore"); + t_require_ext("VK_KHR_external_semaphore_capabilities"); t_require_ext("VK_KHR_external_semaphore_fd"); require_handle_type(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR); @@ -806,8 +808,10 @@ static void test_sync_fd(void) { t_require_ext("VK_KHR_external_memory"); + t_require_ext("VK_KHR_external_memory_capabilities"); t_require_ext("VK_KHR_external_memory_fd"); t_require_ext("VK_KHR_external_semaphore"); + t_require_ext("VK_KHR_external_semaphore_capabilities"); t_require_ext("VK_KHR_external_semaphore_fd"); require_handle_type(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR); |