diff options
| author | Caio Marcelo de Oliveira Filho <[email protected]> | 2020-01-10 16:25:02 -0800 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-02-24 19:12:11 +0000 |
| commit | 956e4b2d371736e073542cf8556f0c972c197989 (patch) | |
| tree | d20de2e73fd5333540b04518bd6eb127082f0e5b /src/compiler/spirv | |
| parent | 6be766336a0ebb556f44765e3d6f6af0e67070a1 (diff) | |
nir, intel: Move use_scoped_memory_barrier to nir_options
This option will be used later by GLSL, so move to a common struct.
Because nir_options is filled in the compiler instead of the Vulkan
driver, fix that up. GLSL will ignore that for now.
Reviewed-by: Jason Ekstrand <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3913>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3913>
Diffstat (limited to 'src/compiler/spirv')
| -rw-r--r-- | src/compiler/spirv/nir_spirv.h | 5 | ||||
| -rw-r--r-- | src/compiler/spirv/spirv_to_nir.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h index 81175ebf022..37fbf351bc9 100644 --- a/src/compiler/spirv/nir_spirv.h +++ b/src/compiler/spirv/nir_spirv.h @@ -67,11 +67,6 @@ struct spirv_to_nir_options { */ bool frag_coord_is_sysval; - /* Whether to generate only scoped_memory_barrier intrinsics instead of the - * set of memory barrier intrinsics based on GLSL. - */ - bool use_scoped_memory_barrier; - struct spirv_supported_capabilities caps; /* Address format for various kinds of pointers. */ diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index fa391168043..5ee75877e8b 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -3576,7 +3576,7 @@ void vtn_emit_memory_barrier(struct vtn_builder *b, SpvScope scope, SpvMemorySemanticsMask semantics) { - if (b->options->use_scoped_memory_barrier) { + if (b->shader->options->use_scoped_memory_barrier) { vtn_emit_scoped_memory_barrier(b, scope, semantics); return; } |