Mesa (main): panfrost,asahi,radv: Don't set internal=true manually
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Feb 18 03:21:51 UTC 2022
Module: Mesa
Branch: main
Commit: 294a357b3368a28ee753045222adda408e9c2a0d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=294a357b3368a28ee753045222adda408e9c2a0d
Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date: Tue Feb 8 12:37:27 2022 -0500
panfrost,asahi,radv: Don't set internal=true manually
nir_builder_init_simple_shader does this automatically now.
Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Acked-by: Rhys Perry <pendingchaos02 at gmail.com>
Acked-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14936>
---
src/amd/vulkan/radv_meta.c | 1 -
src/gallium/drivers/asahi/agx_blit.c | 1 -
src/panfrost/lib/pan_blitter.c | 2 --
src/panfrost/lib/pan_indirect_dispatch.c | 1 -
src/panfrost/lib/pan_indirect_draw.c | 1 -
src/panfrost/vulkan/panvk_vX_meta_clear.c | 2 --
src/panfrost/vulkan/panvk_vX_meta_copy.c | 6 ------
7 files changed, 14 deletions(-)
diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c
index f376a9e6562..15aa1477379 100644
--- a/src/amd/vulkan/radv_meta.c
+++ b/src/amd/vulkan/radv_meta.c
@@ -573,7 +573,6 @@ nir_builder PRINTFLIKE(2, 3) radv_meta_init_shader(gl_shader_stage stage, const
va_end(args);
}
- b.shader->info.internal = true;
b.shader->info.workgroup_size[0] = 1;
b.shader->info.workgroup_size[1] = 1;
b.shader->info.workgroup_size[2] = 1;
diff --git a/src/gallium/drivers/asahi/agx_blit.c b/src/gallium/drivers/asahi/agx_blit.c
index 545be057f4f..f905c5f0bf3 100644
--- a/src/gallium/drivers/asahi/agx_blit.c
+++ b/src/gallium/drivers/asahi/agx_blit.c
@@ -33,7 +33,6 @@ agx_build_reload_shader(struct agx_device *dev)
{
nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT,
&agx_nir_options, "agx_reload");
- b.shader->info.internal = true;
nir_variable *out = nir_variable_create(b.shader, nir_var_shader_out,
glsl_vector_type(GLSL_TYPE_FLOAT, 4), "output");
diff --git a/src/panfrost/lib/pan_blitter.c b/src/panfrost/lib/pan_blitter.c
index afa8a8b5a68..89bc0b771d8 100644
--- a/src/panfrost/lib/pan_blitter.c
+++ b/src/panfrost/lib/pan_blitter.c
@@ -451,8 +451,6 @@ pan_blitter_get_blit_shader(struct panfrost_device *dev,
nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT,
GENX(pan_shader_get_compiler_options)(),
"pan_blit(%s)", sig);
- b.shader->info.internal = true;
-
nir_variable *coord_var =
nir_variable_create(b.shader, nir_var_shader_in,
glsl_vector_type(GLSL_TYPE_FLOAT, coord_comps),
diff --git a/src/panfrost/lib/pan_indirect_dispatch.c b/src/panfrost/lib/pan_indirect_dispatch.c
index ce62ea1d5cc..604d69b185f 100644
--- a/src/panfrost/lib/pan_indirect_dispatch.c
+++ b/src/panfrost/lib/pan_indirect_dispatch.c
@@ -157,7 +157,6 @@ GENX(pan_indirect_dispatch_init)(struct panfrost_device *dev)
nir_builder_init_simple_shader(MESA_SHADER_COMPUTE,
GENX(pan_shader_get_compiler_options)(),
"%s", "indirect_dispatch");
- b.shader->info.internal = true;
nir_variable_create(b.shader, nir_var_mem_ubo,
glsl_uint_type(), "inputs");
b.shader->info.num_ubos++;
diff --git a/src/panfrost/lib/pan_indirect_draw.c b/src/panfrost/lib/pan_indirect_draw.c
index 048babfe201..71068cf128a 100644
--- a/src/panfrost/lib/pan_indirect_draw.c
+++ b/src/panfrost/lib/pan_indirect_draw.c
@@ -375,7 +375,6 @@ init_shader_builder(struct indirect_draw_shader_builder *builder,
}
nir_builder *b = &builder->b;
- b->shader->info.internal = true;
nir_variable_create(b->shader, nir_var_mem_ubo,
glsl_uint_type(), "inputs");
b->shader->info.num_ubos++;
diff --git a/src/panfrost/vulkan/panvk_vX_meta_clear.c b/src/panfrost/vulkan/panvk_vX_meta_clear.c
index 764f1455ddc..218c966664b 100644
--- a/src/panfrost/vulkan/panvk_vX_meta_clear.c
+++ b/src/panfrost/vulkan/panvk_vX_meta_clear.c
@@ -43,7 +43,6 @@ panvk_meta_clear_color_attachment_shader(struct panfrost_device *pdev,
"panvk_meta_clear_rt%d_attachment(base_type=%d)",
rt, base_type);
- b.shader->info.internal = true;
b.shader->info.num_ubos = 1;
const struct glsl_type *out_type = glsl_vector_type(base_type, 4);
@@ -95,7 +94,6 @@ panvk_meta_clear_zs_attachment_shader(struct panfrost_device *pdev,
"panvk_meta_clear_%s%s_attachment()",
clear_z ? "z" : "", clear_s ? "s" : "");
- b.shader->info.internal = true;
b.shader->info.num_ubos = 1;
unsigned drv_loc = 0;
diff --git a/src/panfrost/vulkan/panvk_vX_meta_copy.c b/src/panfrost/vulkan/panvk_vX_meta_copy.c
index 6a6f13e39f3..1a1fc7eaa5a 100644
--- a/src/panfrost/vulkan/panvk_vX_meta_copy.c
+++ b/src/panfrost/vulkan/panvk_vX_meta_copy.c
@@ -402,8 +402,6 @@ panvk_meta_copy_img2img_shader(struct panfrost_device *pdev,
util_format_name(srcfmt), util_format_name(dstfmt),
texdim, texisarray ? "[]" : "", is_ms ? ",ms" : "");
- b.shader->info.internal = true;
-
nir_variable *coord_var =
nir_variable_create(b.shader, nir_var_shader_in,
glsl_vector_type(GLSL_TYPE_FLOAT, texdim + texisarray),
@@ -974,7 +972,6 @@ panvk_meta_copy_buf2img_shader(struct panfrost_device *pdev,
util_format_name(key.imgfmt),
key.mask);
- b.shader->info.internal = true;
b.shader->info.num_ubos = 1;
nir_variable *coord_var =
@@ -1382,7 +1379,6 @@ panvk_meta_copy_img2buf_shader(struct panfrost_device *pdev,
util_format_name(key.imgfmt),
key.mask);
- b.shader->info.internal = true;
b.shader->info.num_ubos = 1;
nir_ssa_def *coord = nir_load_global_invocation_id(&b, 32);
@@ -1784,7 +1780,6 @@ panvk_meta_copy_buf2buf_shader(struct panfrost_device *pdev,
"panvk_meta_copy_buf2buf(blksz=%d)",
blksz);
- b.shader->info.internal = true;
b.shader->info.num_ubos = 1;
nir_ssa_def *coord = nir_load_global_invocation_id(&b, 32);
@@ -1939,7 +1934,6 @@ panvk_meta_fill_buf_shader(struct panfrost_device *pdev,
GENX(pan_shader_get_compiler_options)(),
"panvk_meta_fill_buf()");
- b.shader->info.internal = true;
b.shader->info.num_ubos = 1;
nir_ssa_def *coord = nir_load_global_invocation_id(&b, 32);
More information about the mesa-commit
mailing list