From 807d693421c31ec532842afb70fa00923cf8b5e6 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Tue, 5 Aug 2025 16:52:12 +0800 Subject: [PATCH] compiler: rename gl_shader_stage_is_callable to mesa_shader_stage_is_callable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Mike Blumenkrantz Acked-by: Alyssa Rosenzweig Acked-by: Yonggang Luo Acked-by: Marek Olšák Part-of: --- src/compiler/nir/nir_opt_access.c | 2 +- src/compiler/nir/nir_validate.c | 2 +- src/compiler/shader_enums.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir_opt_access.c b/src/compiler/nir/nir_opt_access.c index 46e1f38089a..cf8048a2d93 100644 --- a/src/compiler/nir/nir_opt_access.c +++ b/src/compiler/nir/nir_opt_access.c @@ -331,7 +331,7 @@ nir_opt_access(nir_shader *shader, const nir_opt_access_options *options) .shader = shader, .vars_written = _mesa_pointer_set_create(NULL), .vars_read = _mesa_pointer_set_create(NULL), - .has_calls = gl_shader_stage_is_callable(shader->info.stage), + .has_calls = mesa_shader_stage_is_callable(shader->info.stage), }; bool var_progress = false; diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c index 0c7d1662a36..12f1b60ef64 100644 --- a/src/compiler/nir/nir_validate.c +++ b/src/compiler/nir/nir_validate.c @@ -2180,7 +2180,7 @@ nir_validate_shader(nir_shader *shader, const char *when) nir_var_mem_constant | nir_var_image; - if (gl_shader_stage_is_callable(shader->info.stage)) + if (mesa_shader_stage_is_callable(shader->info.stage)) valid_modes |= nir_var_shader_call_data; if (shader->info.stage == MESA_SHADER_ANY_HIT || diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h index dc74ef4fcbb..8b6218e85f2 100644 --- a/src/compiler/shader_enums.h +++ b/src/compiler/shader_enums.h @@ -106,7 +106,7 @@ mesa_shader_stage_uses_workgroup(mesa_shader_stage stage) } static inline bool -gl_shader_stage_is_callable(mesa_shader_stage stage) +mesa_shader_stage_is_callable(mesa_shader_stage stage) { return stage == MESA_SHADER_ANY_HIT || stage == MESA_SHADER_CLOSEST_HIT || @@ -118,7 +118,7 @@ gl_shader_stage_is_callable(mesa_shader_stage stage) static inline bool gl_shader_stage_is_rt(mesa_shader_stage stage) { - return stage == MESA_SHADER_RAYGEN || gl_shader_stage_is_callable(stage); + return stage == MESA_SHADER_RAYGEN || mesa_shader_stage_is_callable(stage); } static inline bool