OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler: Move from nir_scope to mesa_scope

Browse Source 
Just moving the enum and performing renames, no behavior change.

Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23328>
This commit is contained in:
Caio Oliveira
2023-05-30 12:05:30 -07:00
committed by Marge Bot
parent 4d26b38caf
commit 59cc77f0fa
52 changed files with 236 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/auxiliary/nir/nir_to_tgsi.c
View File

@@ -2345,7 +2345,7 @@ ntt_emit_barrier(struct ntt_compile *c, nir_intrinsic_instr *intr)
{
bool compute = gl_shader_stage_is_compute(c->s->info.stage);
if (nir_intrinsic_memory_scope(intr) != NIR_SCOPE_NONE) {
if (nir_intrinsic_memory_scope(intr) != SCOPE_NONE) {
nir_variable_mode modes = nir_intrinsic_memory_modes(intr);
unsigned membar = 0;
@@ -2368,7 +2368,7 @@ ntt_emit_barrier(struct ntt_compile *c, nir_intrinsic_instr *intr)
* optimize a bit.
*/
if (membar && compute &&
nir_intrinsic_memory_scope(intr) == NIR_SCOPE_WORKGROUP) {
nir_intrinsic_memory_scope(intr) == SCOPE_WORKGROUP) {
membar |= TGSI_MEMBAR_THREAD_GROUP;
}
@@ -2378,7 +2378,7 @@ ntt_emit_barrier(struct ntt_compile *c, nir_intrinsic_instr *intr)
ntt_MEMBAR(c, ureg_imm1u(c->ureg, membar));
}
if (nir_intrinsic_execution_scope(intr) != NIR_SCOPE_NONE) {
if (nir_intrinsic_execution_scope(intr) != SCOPE_NONE) {
assert(compute || c->s->info.stage == MESA_SHADER_TESS_CTRL);
ntt_BARRIER(c);
}