diff options
| author | Caio Marcelo de Oliveira Filho <[email protected]> | 2019-05-19 00:22:17 -0700 |
|---|---|---|
| committer | Caio Marcelo de Oliveira Filho <[email protected]> | 2019-05-29 10:34:35 -0700 |
| commit | e45bf01940fa6692d4f1d9385c2d6466da06a9bb (patch) | |
| tree | 4e8c8694747bb1d65374f878434c03020f8aec65 /src/gallium/drivers/freedreno | |
| parent | a3bfdacb6c9f992dd1933c163c2580049ffea11e (diff) | |
spirv: Change spirv_to_nir() to return a nir_shader
spirv_to_nir() returned the nir_function corresponding to the
entrypoint, as a way to identify it. There's now a bool is_entrypoint
in nir_function and also a helper function to get the entry_point from
a nir_shader.
The return type reflects better what the function name suggests. It
also helps drivers avoid the mistake of reusing internal shader
references after running NIR_PASS on it. When using NIR_TEST_CLONE or
NIR_TEST_SERIALIZE, those would be invalidated right in the first pass
executed.
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/gallium/drivers/freedreno')
| -rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_cmdline.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c index d45f5afec8b..34b39aa65f0 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c @@ -242,21 +242,21 @@ load_spirv(const char *filename, const char *entry, gl_shader_stage stage) .func = debug_func, } }; - nir_function *entry_point; + nir_shader *nir; void *buf; size_t size; read_file(filename, &buf, &size); - entry_point = spirv_to_nir(buf, size / 4, + nir = spirv_to_nir(buf, size / 4, NULL, 0, /* spec_entries */ stage, entry, &spirv_options, ir3_get_compiler_options(compiler)); - nir_print_shader(entry_point->shader, stdout); + nir_print_shader(nir, stdout); - return entry_point->shader; + return nir; } static void print_usage(void) |