From: Eric Anholt Date: Mon, 26 Oct 2020 18:28:33 +0000 (-0700) Subject: nir/builder: Drop the mem_ctx arg from nir_builder_init_simple_shader(). X-Git-Tag: upstream/21.0.0~2705 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f992802f5130352e903218cf3541e429b87cae2;p=platform%2Fupstream%2Fmesa.git nir/builder: Drop the mem_ctx arg from nir_builder_init_simple_shader(). This looks a lot more simple now! Reviewed-by: Rhys Perry Part-of: --- diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index efedcdf..d048698 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@ -548,7 +548,7 @@ radv_meta_build_nir_vs_generate_vertices(void) nir_variable *v_position; - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_vs_gen_verts"); nir_ssa_def *outvec = radv_meta_gen_rect_vertices(&b); @@ -565,7 +565,7 @@ radv_meta_build_nir_vs_generate_vertices(void) nir_shader * radv_meta_build_nir_fs_noop(void) { - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); b.shader->info.name = ralloc_asprintf(b.shader, "meta_noop_fs"); diff --git a/src/amd/vulkan/radv_meta_blit.c b/src/amd/vulkan/radv_meta_blit.c index fcc4eab..8c96457 100644 --- a/src/amd/vulkan/radv_meta_blit.c +++ b/src/amd/vulkan/radv_meta_blit.c @@ -42,7 +42,7 @@ static nir_shader * build_nir_vertex_shader(void) { const struct glsl_type *vec4 = glsl_vec4_type(); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_blit_vs"); nir_variable *pos_out = nir_variable_create(b.shader, nir_var_shader_out, @@ -109,7 +109,7 @@ build_nir_copy_fragment_shader(enum glsl_sampler_dim tex_dim) { char shader_name[64]; const struct glsl_type *vec4 = glsl_vec4_type(); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); sprintf(shader_name, "meta_blit_fs.%d", tex_dim); b.shader->info.name = ralloc_strdup(b.shader, shader_name); @@ -165,7 +165,7 @@ build_nir_copy_fragment_shader_depth(enum glsl_sampler_dim tex_dim) { char shader_name[64]; const struct glsl_type *vec4 = glsl_vec4_type(); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); sprintf(shader_name, "meta_blit_depth_fs.%d", tex_dim); b.shader->info.name = ralloc_strdup(b.shader, shader_name); @@ -221,7 +221,7 @@ build_nir_copy_fragment_shader_stencil(enum glsl_sampler_dim tex_dim) { char shader_name[64]; const struct glsl_type *vec4 = glsl_vec4_type(); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); sprintf(shader_name, "meta_blit_stencil_fs.%d", tex_dim); b.shader->info.name = ralloc_strdup(b.shader, shader_name); diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/radv_meta_blit2d.c index 9cf951c..af6a266 100644 --- a/src/amd/vulkan/radv_meta_blit2d.c +++ b/src/amd/vulkan/radv_meta_blit2d.c @@ -428,7 +428,7 @@ build_nir_vertex_shader(void) { const struct glsl_type *vec4 = glsl_vec4_type(); const struct glsl_type *vec2 = glsl_vector_type(GLSL_TYPE_FLOAT, 2); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_blit2d_vs"); nir_variable *pos_out = nir_variable_create(b.shader, nir_var_shader_out, @@ -601,7 +601,7 @@ build_nir_copy_fragment_shader(struct radv_device *device, { const struct glsl_type *vec4 = glsl_vec4_type(); const struct glsl_type *vec2 = glsl_vector_type(GLSL_TYPE_FLOAT, 2); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); b.shader->info.name = ralloc_strdup(b.shader, name); nir_variable *tex_pos_in = nir_variable_create(b.shader, nir_var_shader_in, @@ -628,7 +628,7 @@ build_nir_copy_fragment_shader_depth(struct radv_device *device, { const struct glsl_type *vec4 = glsl_vec4_type(); const struct glsl_type *vec2 = glsl_vector_type(GLSL_TYPE_FLOAT, 2); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); b.shader->info.name = ralloc_strdup(b.shader, name); nir_variable *tex_pos_in = nir_variable_create(b.shader, nir_var_shader_in, @@ -655,7 +655,7 @@ build_nir_copy_fragment_shader_stencil(struct radv_device *device, { const struct glsl_type *vec4 = glsl_vec4_type(); const struct glsl_type *vec2 = glsl_vector_type(GLSL_TYPE_FLOAT, 2); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); b.shader->info.name = ralloc_strdup(b.shader, name); nir_variable *tex_pos_in = nir_variable_create(b.shader, nir_var_shader_in, diff --git a/src/amd/vulkan/radv_meta_buffer.c b/src/amd/vulkan/radv_meta_buffer.c index 08bfcd2..9632937 100644 --- a/src/amd/vulkan/radv_meta_buffer.c +++ b/src/amd/vulkan/radv_meta_buffer.c @@ -7,7 +7,7 @@ static nir_shader * build_buffer_fill_shader(struct radv_device *dev) { - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_buffer_fill"); b.shader->info.cs.local_size[0] = 64; b.shader->info.cs.local_size[1] = 1; @@ -53,7 +53,7 @@ build_buffer_fill_shader(struct radv_device *dev) static nir_shader * build_buffer_copy_shader(struct radv_device *dev) { - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_buffer_copy"); b.shader->info.cs.local_size[0] = 64; b.shader->info.cs.local_size[1] = 1; diff --git a/src/amd/vulkan/radv_meta_bufimage.c b/src/amd/vulkan/radv_meta_bufimage.c index bde1622..5467e8b 100644 --- a/src/amd/vulkan/radv_meta_bufimage.c +++ b/src/amd/vulkan/radv_meta_bufimage.c @@ -43,7 +43,7 @@ build_nir_itob_compute_shader(struct radv_device *dev, bool is_3d) const struct glsl_type *img_type = glsl_image_type(GLSL_SAMPLER_DIM_BUF, false, GLSL_TYPE_FLOAT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, is_3d ? "meta_itob_cs_3d" : "meta_itob_cs"); b.shader->info.cs.local_size[0] = 16; b.shader->info.cs.local_size[1] = 16; @@ -271,7 +271,7 @@ build_nir_btoi_compute_shader(struct radv_device *dev, bool is_3d) const struct glsl_type *img_type = glsl_image_type(dim, false, GLSL_TYPE_FLOAT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, is_3d ? "meta_btoi_cs_3d" : "meta_btoi_cs"); b.shader->info.cs.local_size[0] = 16; b.shader->info.cs.local_size[1] = 16; @@ -492,7 +492,7 @@ build_nir_btoi_r32g32b32_compute_shader(struct radv_device *dev) const struct glsl_type *img_type = glsl_image_type(GLSL_SAMPLER_DIM_BUF, false, GLSL_TYPE_FLOAT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_btoi_r32g32b32_cs"); b.shader->info.cs.local_size[0] = 16; b.shader->info.cs.local_size[1] = 16; @@ -699,7 +699,7 @@ build_nir_itoi_compute_shader(struct radv_device *dev, bool is_3d) const struct glsl_type *img_type = glsl_image_type(dim, false, GLSL_TYPE_FLOAT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, is_3d ? "meta_itoi_cs_3d" : "meta_itoi_cs"); b.shader->info.cs.local_size[0] = 16; b.shader->info.cs.local_size[1] = 16; @@ -915,7 +915,7 @@ build_nir_itoi_r32g32b32_compute_shader(struct radv_device *dev) const struct glsl_type *img_type = glsl_image_type(GLSL_SAMPLER_DIM_BUF, false, GLSL_TYPE_FLOAT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_itoi_r32g32b32_cs"); b.shader->info.cs.local_size[0] = 16; b.shader->info.cs.local_size[1] = 16; @@ -1125,7 +1125,7 @@ build_nir_cleari_compute_shader(struct radv_device *dev, bool is_3d) const struct glsl_type *img_type = glsl_image_type(dim, false, GLSL_TYPE_FLOAT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, is_3d ? "meta_cleari_cs_3d" : "meta_cleari_cs"); b.shader->info.cs.local_size[0] = 16; b.shader->info.cs.local_size[1] = 16; @@ -1316,7 +1316,7 @@ build_nir_cleari_r32g32b32_compute_shader(struct radv_device *dev) const struct glsl_type *img_type = glsl_image_type(GLSL_SAMPLER_DIM_BUF, false, GLSL_TYPE_FLOAT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_cleari_r32g32b32_cs"); b.shader->info.cs.local_size[0] = 16; b.shader->info.cs.local_size[1] = 16; diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index ba05ad7..16f481b 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -40,8 +40,8 @@ build_color_shaders(struct nir_shader **out_vs, struct nir_shader **out_fs, uint32_t frag_output) { - nir_builder vs_b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, NULL); - nir_builder fs_b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder vs_b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, NULL); + nir_builder fs_b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); vs_b.shader->info.name = ralloc_strdup(vs_b.shader, "meta_clear_color_vs"); fs_b.shader->info.name = ralloc_strdup(fs_b.shader, "meta_clear_color_fs"); @@ -504,8 +504,8 @@ build_depthstencil_shader(struct nir_shader **out_vs, struct nir_shader **out_fs, bool unrestricted) { - nir_builder vs_b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, NULL); - nir_builder fs_b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder vs_b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, NULL); + nir_builder fs_b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); vs_b.shader->info.name = ralloc_strdup(vs_b.shader, unrestricted ? "meta_clear_depthstencil_unrestricted_vs" @@ -1161,7 +1161,7 @@ radv_fast_clear_depth(struct radv_cmd_buffer *cmd_buffer, static nir_shader * build_clear_htile_mask_shader() { - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_clear_htile_mask"); b.shader->info.cs.local_size[0] = 64; b.shader->info.cs.local_size[1] = 1; diff --git a/src/amd/vulkan/radv_meta_fast_clear.c b/src/amd/vulkan/radv_meta_fast_clear.c index 6472ca9..8d17aaf 100644 --- a/src/amd/vulkan/radv_meta_fast_clear.c +++ b/src/amd/vulkan/radv_meta_fast_clear.c @@ -40,7 +40,7 @@ build_dcc_decompress_compute_shader(struct radv_device *dev) false, GLSL_TYPE_FLOAT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "dcc_decompress_compute"); /* We need at least 16/16/1 to cover an entire DCC block in a single workgroup. */ diff --git a/src/amd/vulkan/radv_meta_fmask_expand.c b/src/amd/vulkan/radv_meta_fmask_expand.c index 6cfa072..5b61b83 100644 --- a/src/amd/vulkan/radv_meta_fmask_expand.c +++ b/src/amd/vulkan/radv_meta_fmask_expand.c @@ -39,7 +39,7 @@ build_fmask_expand_compute_shader(struct radv_device *device, int samples) snprintf(name, 64, "meta_fmask_expand_cs-%d", samples); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, name); b.shader->info.cs.local_size[0] = 16; b.shader->info.cs.local_size[1] = 16; diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c index a60196f..49c1410 100644 --- a/src/amd/vulkan/radv_meta_resolve.c +++ b/src/amd/vulkan/radv_meta_resolve.c @@ -37,7 +37,7 @@ build_nir_fs(void) const struct glsl_type *vec4 = glsl_vec4_type(); nir_variable *f_color; /* vec4, fragment output color */ - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); b.shader->info.name = ralloc_asprintf(b.shader, "meta_resolve_fs"); diff --git a/src/amd/vulkan/radv_meta_resolve_cs.c b/src/amd/vulkan/radv_meta_resolve_cs.c index 3ec8e43..6133422 100644 --- a/src/amd/vulkan/radv_meta_resolve_cs.c +++ b/src/amd/vulkan/radv_meta_resolve_cs.c @@ -76,7 +76,7 @@ build_resolve_compute_shader(struct radv_device *dev, bool is_integer, bool is_s false, GLSL_TYPE_FLOAT); snprintf(name, 64, "meta_resolve_cs-%d-%s", samples, is_integer ? "int" : (is_srgb ? "srgb" : "float")); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, name); b.shader->info.cs.local_size[0] = 16; b.shader->info.cs.local_size[1] = 16; @@ -177,7 +177,7 @@ build_depth_stencil_resolve_compute_shader(struct radv_device *dev, int samples, index == DEPTH_RESOLVE ? "depth" : "stencil", get_resolve_mode_str(resolve_mode), samples); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, name); b.shader->info.cs.local_size[0] = 16; b.shader->info.cs.local_size[1] = 16; diff --git a/src/amd/vulkan/radv_meta_resolve_fs.c b/src/amd/vulkan/radv_meta_resolve_fs.c index 33a09ea..f9e295d 100644 --- a/src/amd/vulkan/radv_meta_resolve_fs.c +++ b/src/amd/vulkan/radv_meta_resolve_fs.c @@ -35,7 +35,7 @@ static nir_shader * build_nir_vertex_shader(void) { const struct glsl_type *vec4 = glsl_vec4_type(); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_resolve_vs"); nir_variable *pos_out = nir_variable_create(b.shader, nir_var_shader_out, @@ -59,7 +59,7 @@ build_resolve_fragment_shader(struct radv_device *dev, bool is_integer, int samp GLSL_TYPE_FLOAT); snprintf(name, 64, "meta_resolve_fs-%d-%s", samples, is_integer ? "int" : "float"); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); b.shader->info.name = ralloc_strdup(b.shader, name); nir_variable *input_img = nir_variable_create(b.shader, nir_var_uniform, @@ -367,7 +367,7 @@ build_depth_stencil_resolve_fragment_shader(struct radv_device *dev, int samples index == DEPTH_RESOLVE ? "depth" : "stencil", get_resolve_mode_str(resolve_mode), samples); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); b.shader->info.name = ralloc_strdup(b.shader, name); nir_variable *input_img = nir_variable_create(b.shader, nir_var_uniform, diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 8286385..2151eeb 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -3073,7 +3073,7 @@ VkResult radv_create_shaders(struct radv_pipeline *pipeline, } if (!modules[MESA_SHADER_FRAGMENT] && !modules[MESA_SHADER_COMPUTE]) { - nir_builder fs_b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder fs_b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); fs_b.shader->info.name = ralloc_strdup(fs_b.shader, "noop_fs"); fs_m.nir = fs_b.shader; modules[MESA_SHADER_FRAGMENT] = &fs_m; diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index 4be6ea1..69dc071 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -153,7 +153,7 @@ build_occlusion_query_shader(struct radv_device *device) { * } * } */ - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "occlusion_query"); b.shader->info.cs.local_size[0] = 64; b.shader->info.cs.local_size[1] = 1; @@ -320,7 +320,7 @@ build_pipeline_statistics_query_shader(struct radv_device *device) { * } * } */ - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "pipeline_statistics_query"); b.shader->info.cs.local_size[0] = 64; b.shader->info.cs.local_size[1] = 1; @@ -514,7 +514,7 @@ build_tfb_query_shader(struct radv_device *device) * } * } */ - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "tfb_query"); b.shader->info.cs.local_size[0] = 64; b.shader->info.cs.local_size[1] = 1; @@ -692,7 +692,7 @@ build_timestamp_query_shader(struct radv_device *device) * } * } */ - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "timestamp_query"); b.shader->info.cs.local_size[0] = 64; b.shader->info.cs.local_size[1] = 1; diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 9d7c8ac..9809d6d 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -1403,7 +1403,7 @@ radv_create_trap_handler_shader(struct radv_device *device) struct radv_shader_binary *binary = NULL; struct radv_shader_info info = {0}; - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, NULL); b.shader->info.name = ralloc_strdup(b.shader, "meta_trap_handler"); options.explicit_scratch_args = true; diff --git a/src/broadcom/vulkan/v3dv_meta_clear.c b/src/broadcom/vulkan/v3dv_meta_clear.c index 8b03b36..cc54952 100644 --- a/src/broadcom/vulkan/v3dv_meta_clear.c +++ b/src/broadcom/vulkan/v3dv_meta_clear.c @@ -130,7 +130,7 @@ static nir_shader * get_clear_rect_vs() { const nir_shader_compiler_options *options = v3dv_pipeline_get_nir_options(); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, options); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, options); b.shader->info.name = ralloc_strdup(b.shader, "meta clear vs"); const struct glsl_type *vec4 = glsl_vec4_type(); @@ -148,7 +148,7 @@ static nir_shader * get_color_clear_rect_fs(uint32_t rt_idx, VkFormat format) { const nir_shader_compiler_options *options = v3dv_pipeline_get_nir_options(); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, options); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, options); b.shader->info.name = ralloc_strdup(b.shader, "meta clear fs"); enum pipe_format pformat = vk_format_to_pipe_format(format); @@ -177,7 +177,7 @@ static nir_shader * get_depth_clear_rect_fs() { const nir_shader_compiler_options *options = v3dv_pipeline_get_nir_options(); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, options); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, options); b.shader->info.name = ralloc_strdup(b.shader, "meta depth clear fs"); nir_variable *fs_out_depth = diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c index 21e25b9..1835836 100644 --- a/src/broadcom/vulkan/v3dv_meta_copy.c +++ b/src/broadcom/vulkan/v3dv_meta_copy.c @@ -3493,7 +3493,7 @@ static nir_shader * get_blit_vs() { const nir_shader_compiler_options *options = v3dv_pipeline_get_nir_options(); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, options); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, options); b.shader->info.name = ralloc_strdup(b.shader, "meta blit vs"); const struct glsl_type *vec4 = glsl_vec4_type(); @@ -3538,7 +3538,7 @@ get_color_blit_fs(struct v3dv_device *device, enum glsl_sampler_dim sampler_dim) { const nir_shader_compiler_options *options = v3dv_pipeline_get_nir_options(); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, options); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, options); b.shader->info.name = ralloc_strdup(b.shader, "meta blit fs"); const struct glsl_type *vec4 = glsl_vec4_type(); diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index 8490eb8..6017369 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -1995,7 +1995,7 @@ pipeline_compile_graphics(struct v3dv_pipeline *pipeline, /* Add a no-op fragment shader if needed */ if (!pipeline->fs) { - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, &v3dv_nir_options); b.shader->info.name = ralloc_strdup(b.shader, "noop_fs"); diff --git a/src/compiler/nir/nir_builder.h b/src/compiler/nir/nir_builder.h index 94cca4c..2570513 100644 --- a/src/compiler/nir/nir_builder.h +++ b/src/compiler/nir/nir_builder.h @@ -54,14 +54,13 @@ nir_builder_init(nir_builder *build, nir_function_impl *impl) } static inline nir_builder MUST_CHECK -nir_builder_init_simple_shader(void *mem_ctx, - gl_shader_stage stage, +nir_builder_init_simple_shader(gl_shader_stage stage, const nir_shader_compiler_options *options) { nir_builder b; memset(&b, 0, sizeof(b)); - b.shader = nir_shader_create(mem_ctx, stage, options, NULL); + b.shader = nir_shader_create(NULL, stage, options, NULL); nir_function *func = nir_function_create(b.shader, "main"); func->is_entrypoint = true; b.exact = false; diff --git a/src/compiler/nir/tests/builder_tests.cpp b/src/compiler/nir/tests/builder_tests.cpp index 244057d..61066654 100644 --- a/src/compiler/nir/tests/builder_tests.cpp +++ b/src/compiler/nir/tests/builder_tests.cpp @@ -75,7 +75,7 @@ nir_builder_test::nir_builder_test() glsl_type_singleton_init_or_ref(); static const nir_shader_compiler_options options = { }; - _b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, &options); + _b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, &options); b = &_b; } diff --git a/src/compiler/nir/tests/comparison_pre_tests.cpp b/src/compiler/nir/tests/comparison_pre_tests.cpp index 2573be4..3ccaf2a 100644 --- a/src/compiler/nir/tests/comparison_pre_tests.cpp +++ b/src/compiler/nir/tests/comparison_pre_tests.cpp @@ -31,7 +31,7 @@ protected: glsl_type_singleton_init_or_ref(); static const nir_shader_compiler_options options = { }; - bld = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, &options); + bld = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, &options); v1 = nir_imm_vec4(&bld, -2.0, -1.0, 1.0, 2.0); v2 = nir_imm_vec4(&bld, 2.0, 1.0, -1.0, -2.0); diff --git a/src/compiler/nir/tests/control_flow_tests.cpp b/src/compiler/nir/tests/control_flow_tests.cpp index 089f81b..91f1b1a 100644 --- a/src/compiler/nir/tests/control_flow_tests.cpp +++ b/src/compiler/nir/tests/control_flow_tests.cpp @@ -37,7 +37,7 @@ nir_cf_test::nir_cf_test() glsl_type_singleton_init_or_ref(); static const nir_shader_compiler_options options = { }; - b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, &options); + b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, &options); } nir_cf_test::~nir_cf_test() diff --git a/src/compiler/nir/tests/load_store_vectorizer_tests.cpp b/src/compiler/nir/tests/load_store_vectorizer_tests.cpp index 7d98ca2..550b8d5 100644 --- a/src/compiler/nir/tests/load_store_vectorizer_tests.cpp +++ b/src/compiler/nir/tests/load_store_vectorizer_tests.cpp @@ -89,7 +89,7 @@ nir_load_store_vectorize_test::nir_load_store_vectorize_test() glsl_type_singleton_init_or_ref(); static const nir_shader_compiler_options options = { }; - _b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, &options); + _b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, &options); b = &_b; } diff --git a/src/compiler/nir/tests/lower_returns_tests.cpp b/src/compiler/nir/tests/lower_returns_tests.cpp index dc8733a..7a2f676 100644 --- a/src/compiler/nir/tests/lower_returns_tests.cpp +++ b/src/compiler/nir/tests/lower_returns_tests.cpp @@ -39,7 +39,7 @@ nir_opt_lower_returns_test::nir_opt_lower_returns_test() glsl_type_singleton_init_or_ref(); static const nir_shader_compiler_options options = { }; - bld = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, &options); + bld = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, &options); nir_variable *var = nir_variable_create(bld.shader, nir_var_shader_in, glsl_int_type(), "in"); in_def = nir_load_var(&bld, var); diff --git a/src/compiler/nir/tests/negative_equal_tests.cpp b/src/compiler/nir/tests/negative_equal_tests.cpp index 3c8745e..39bfe0f 100644 --- a/src/compiler/nir/tests/negative_equal_tests.cpp +++ b/src/compiler/nir/tests/negative_equal_tests.cpp @@ -57,7 +57,7 @@ protected: glsl_type_singleton_init_or_ref(); static const nir_shader_compiler_options options = { }; - bld = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, &options); + bld = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, &options); memset(c1, 0, sizeof(c1)); memset(c2, 0, sizeof(c2)); } diff --git a/src/compiler/nir/tests/opt_if_tests.cpp b/src/compiler/nir/tests/opt_if_tests.cpp index e728471..6df57b6 100644 --- a/src/compiler/nir/tests/opt_if_tests.cpp +++ b/src/compiler/nir/tests/opt_if_tests.cpp @@ -40,7 +40,7 @@ nir_opt_if_test::nir_opt_if_test() glsl_type_singleton_init_or_ref(); static const nir_shader_compiler_options options = { }; - bld = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, &options); + bld = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, &options); nir_variable *var = nir_variable_create(bld.shader, nir_var_shader_in, glsl_int_type(), "in"); in_def = nir_load_var(&bld, var); diff --git a/src/compiler/nir/tests/serialize_tests.cpp b/src/compiler/nir/tests/serialize_tests.cpp index 60e338e..2fea79f 100644 --- a/src/compiler/nir/tests/serialize_tests.cpp +++ b/src/compiler/nir/tests/serialize_tests.cpp @@ -48,7 +48,7 @@ nir_serialize_test::nir_serialize_test() { glsl_type_singleton_init_or_ref(); - _b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, &options); + _b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, &options); b = &_b; } diff --git a/src/compiler/nir/tests/vars_tests.cpp b/src/compiler/nir/tests/vars_tests.cpp index 63a9977..50769f6 100644 --- a/src/compiler/nir/tests/vars_tests.cpp +++ b/src/compiler/nir/tests/vars_tests.cpp @@ -102,7 +102,7 @@ nir_vars_test::nir_vars_test() glsl_type_singleton_init_or_ref(); static const nir_shader_compiler_options options = { }; - _b = nir_builder_init_simple_shader(NULL, MESA_SHADER_COMPUTE, &options); + _b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, &options); b = &_b; lin_ctx = linear_alloc_parent(b->shader, 0); } diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index 54c0be0..6a6cdde 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -2058,8 +2058,7 @@ tu_pipeline_builder_compile_shaders(struct tu_pipeline_builder *builder, if (!nir[MESA_SHADER_FRAGMENT]) { const nir_shader_compiler_options *nir_options = ir3_get_compiler_options(builder->device->compiler); - nir_builder fs_b = nir_builder_init_simple_shader(NULL, - MESA_SHADER_FRAGMENT, + nir_builder fs_b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, nir_options); fs_b.shader->info.name = ralloc_strdup(fs_b.shader, "noop_fs"); nir[MESA_SHADER_FRAGMENT] = fs_b.shader; diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c index 233ffcf..3e784af 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -2299,8 +2299,7 @@ ttn_compile_init(const void *tgsi_tokens, screen->get_compiler_options(screen, PIPE_SHADER_IR_NIR, scan.processor); } - c->build = nir_builder_init_simple_shader(NULL, - tgsi_processor_to_shader_stage(scan.processor), + c->build = nir_builder_init_simple_shader(tgsi_processor_to_shader_stage(scan.processor), options); s = c->build.shader; diff --git a/src/gallium/drivers/vc4/vc4_blit.c b/src/gallium/drivers/vc4/vc4_blit.c index f109628..c16b84d 100644 --- a/src/gallium/drivers/vc4/vc4_blit.c +++ b/src/gallium/drivers/vc4/vc4_blit.c @@ -199,7 +199,7 @@ static void *vc4_get_yuv_vs(struct pipe_context *pctx) PIPE_SHADER_IR_NIR, PIPE_SHADER_VERTEX); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, options); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, options); b.shader->info.name = ralloc_strdup(b.shader, "linear_blit_vs"); const struct glsl_type *vec4 = glsl_vec4_type(); @@ -245,7 +245,7 @@ static void *vc4_get_yuv_fs(struct pipe_context *pctx, int cpp) PIPE_SHADER_IR_NIR, PIPE_SHADER_FRAGMENT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, options); b.shader->info.name = ralloc_strdup(b.shader, name); diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c index 60c209e..f29a882 100644 --- a/src/gallium/frontends/lavapipe/lvp_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c @@ -789,7 +789,7 @@ lvp_graphics_pipeline_init(struct lvp_pipeline *pipeline, if (has_fragment_shader == false) { /* create a dummy fragment shader for this pipeline. */ - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, NULL); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, NULL); b.shader->info.name = ralloc_strdup(b.shader, "dummy_frag"); pipeline->pipeline_nir[MESA_SHADER_FRAGMENT] = b.shader; diff --git a/src/intel/blorp/blorp_nir_builder.h b/src/intel/blorp/blorp_nir_builder.h index 2f9464f..5550c1d 100644 --- a/src/intel/blorp/blorp_nir_builder.h +++ b/src/intel/blorp/blorp_nir_builder.h @@ -29,7 +29,7 @@ blorp_nir_init_shader(nir_builder *b, gl_shader_stage stage, const char *name) { - *b = nir_builder_init_simple_shader(NULL, stage, NULL); + *b = nir_builder_init_simple_shader(stage, NULL); ralloc_adopt(mem_ctx, b->shader); if (name != NULL) b->shader->info.name = ralloc_strdup(b->shader, name); diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c index ff4730a..df5473f 100644 --- a/src/intel/compiler/brw_nir.c +++ b/src/intel/compiler/brw_nir.c @@ -1475,7 +1475,7 @@ brw_nir_create_passthrough_tcs(void *mem_ctx, const struct brw_compiler *compile const nir_shader_compiler_options *options, const struct brw_tcs_prog_key *key) { - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_TESS_CTRL, + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_TESS_CTRL, options); ralloc_adopt(mem_ctx, b.shader); nir_shader *nir = b.shader; diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index 8c3b4e8..25fe001 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -969,7 +969,7 @@ prog_to_nir(const struct gl_program *prog, return NULL; c->prog = prog; - c->build = nir_builder_init_simple_shader(NULL, stage, options); + c->build = nir_builder_init_simple_shader(stage, options); /* Copy the shader_info from the gl_program */ c->build.shader->info = prog->info; diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index 50ad3fb..fa0a061 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -151,7 +151,7 @@ make_drawpix_z_stencil_program_nir(struct st_context *st, const nir_shader_compiler_options *options = st_get_nir_compiler_options(st, MESA_SHADER_FRAGMENT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, options); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, options); nir_variable *texcoord = nir_variable_create(b.shader, nir_var_shader_in, glsl_vec_type(2), @@ -204,7 +204,7 @@ make_drawpix_zs_to_color_program_nir(struct st_context *st, const nir_shader_compiler_options *options = st_get_nir_compiler_options(st, MESA_SHADER_FRAGMENT); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, options); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, options); nir_variable *texcoord = nir_variable_create(b.shader, nir_var_shader_in, glsl_vec_type(2), diff --git a/src/mesa/state_tracker/st_nir_builtins.c b/src/mesa/state_tracker/st_nir_builtins.c index e1b2f8a..7e984e5 100644 --- a/src/mesa/state_tracker/st_nir_builtins.c +++ b/src/mesa/state_tracker/st_nir_builtins.c @@ -117,7 +117,7 @@ st_nir_make_passthrough_shader(struct st_context *st, const nir_shader_compiler_options *options = st_get_nir_compiler_options(st, stage); - nir_builder b = nir_builder_init_simple_shader(NULL, stage, options); + nir_builder b = nir_builder_init_simple_shader(stage, options); char var_name[15]; diff --git a/src/mesa/state_tracker/st_pbo.c b/src/mesa/state_tracker/st_pbo.c index ccc8a54..fd8d7f5 100644 --- a/src/mesa/state_tracker/st_pbo.c +++ b/src/mesa/state_tracker/st_pbo.c @@ -296,7 +296,7 @@ st_pbo_create_vs(struct st_context *st) const nir_shader_compiler_options *options = st_get_nir_compiler_options(st, MESA_SHADER_VERTEX); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_VERTEX, options); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_VERTEX, options); nir_variable *in_pos = nir_variable_create(b.shader, nir_var_shader_in, vec4, "in_pos"); @@ -410,7 +410,7 @@ create_fs(struct st_context *st, bool download, bool pos_is_sysval = screen->get_param(screen, PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL); - nir_builder b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, options); + nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, options); nir_ssa_def *zero = nir_imm_int(&b, 0); diff --git a/src/panfrost/lib/pan_blit.c b/src/panfrost/lib/pan_blit.c index 332fe8f..8140f4d 100644 --- a/src/panfrost/lib/pan_blit.c +++ b/src/panfrost/lib/pan_blit.c @@ -52,7 +52,7 @@ panfrost_build_blit_shader(struct panfrost_device *dev, { bool is_colour = loc >= FRAG_RESULT_DATA0; - nir_builder _b = nir_builder_init_simple_shader(NULL, MESA_SHADER_FRAGMENT, &midgard_nir_options); + nir_builder _b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, &midgard_nir_options); nir_builder *b = &_b; nir_shader *shader = b->shader;