From c92be29a477a2262349f484d4a511dce435726b3 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 26 Aug 2020 16:48:13 -0400 Subject: [PATCH] panfrost: Use nir_builder_init_simple_shader for blits Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/lib/pan_blit.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/panfrost/lib/pan_blit.c b/src/panfrost/lib/pan_blit.c index 79a91200d8e..9967e211d37 100644 --- a/src/panfrost/lib/pan_blit.c +++ b/src/panfrost/lib/pan_blit.c @@ -48,9 +48,10 @@ panfrost_build_blit_shader(panfrost_program *program, unsigned gpu_id, gl_frag_r { bool is_colour = loc >= FRAG_RESULT_DATA0; - nir_shader *shader = nir_shader_create(NULL, MESA_SHADER_FRAGMENT, &midgard_nir_options, NULL); - nir_function *fn = nir_function_create(shader, "main"); - nir_function_impl *impl = nir_function_impl_create(fn); + nir_builder _b; + nir_builder_init_simple_shader(&_b, NULL, MESA_SHADER_FRAGMENT, &midgard_nir_options); + nir_builder *b = &_b; + nir_shader *shader = b->shader; nir_variable *c_src = nir_variable_create(shader, nir_var_shader_in, glsl_vector_type(GLSL_TYPE_FLOAT, 2), "coord"); nir_variable *c_out = nir_variable_create(shader, nir_var_shader_out, glsl_vector_type( @@ -59,11 +60,6 @@ panfrost_build_blit_shader(panfrost_program *program, unsigned gpu_id, gl_frag_r c_src->data.location = VARYING_SLOT_TEX0; c_out->data.location = loc; - nir_builder _b; - nir_builder *b = &_b; - nir_builder_init(b, impl); - b->cursor = nir_before_block(nir_start_block(impl)); - nir_ssa_def *coord = nir_load_var(b, c_src); nir_tex_instr *tex = nir_tex_instr_create(shader, ms ? 3 : 1); -- 2.30.2