diff --git a/src/intel/blorp/blorp.c b/src/intel/blorp/blorp.c index 37d7d30a951..c88ddc90b9b 100644 --- a/src/intel/blorp/blorp.c +++ b/src/intel/blorp/blorp.c @@ -250,12 +250,6 @@ blorp_params_init(struct blorp_params *params) params->num_layers = 1; } -void -brw_blorp_init_cs_prog_key(struct brw_cs_prog_key *cs_key) -{ - memset(cs_key, 0, sizeof(*cs_key)); -} - const unsigned * blorp_compile_fs(struct blorp_context *blorp, void *mem_ctx, struct nir_shader *nir, @@ -357,7 +351,6 @@ lower_base_workgroup_id(nir_builder *b, nir_intrinsic_instr *intrin, const unsigned * blorp_compile_cs(struct blorp_context *blorp, void *mem_ctx, struct nir_shader *nir, - struct brw_cs_prog_key *cs_key, struct brw_cs_prog_data *cs_prog_data) { const struct brw_compiler *compiler = blorp->compiler; @@ -385,6 +378,9 @@ blorp_compile_cs(struct blorp_context *blorp, void *mem_ctx, NIR_PASS_V(nir, nir_shader_intrinsics_pass, lower_base_workgroup_id, nir_metadata_block_index | nir_metadata_dominance, NULL); + struct brw_cs_prog_key cs_key; + memset(&cs_key, 0, sizeof(cs_key)); + struct brw_compile_cs_params params = { .base = { .mem_ctx = mem_ctx, @@ -392,7 +388,7 @@ blorp_compile_cs(struct blorp_context *blorp, void *mem_ctx, .log_data = blorp->driver_ctx, .debug_flag = DEBUG_BLORP, }, - .key = cs_key, + .key = &cs_key, .prog_data = cs_prog_data, }; diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c index d15378aa77e..4b4224579c8 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -1554,11 +1554,9 @@ blorp_get_blit_kernel_cs(struct blorp_batch *batch, nir->info.name = ralloc_strdup(nir, "BLORP-gpgpu-blit"); blorp_set_cs_dims(nir, prog_key->local_y); - struct brw_cs_prog_key cs_key; - brw_blorp_init_cs_prog_key(&cs_key); assert(prog_key->rt_samples == 1); - program = blorp_compile_cs(blorp, mem_ctx, nir, &cs_key, &prog_data); + program = blorp_compile_cs(blorp, mem_ctx, nir, &prog_data); bool result = blorp->upload_shader(batch, MESA_SHADER_COMPUTE, diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c index cc69340b1b6..c0e6d19c600 100644 --- a/src/intel/blorp/blorp_clear.c +++ b/src/intel/blorp/blorp_clear.c @@ -164,12 +164,9 @@ blorp_params_get_clear_kernel_cs(struct blorp_batch *batch, nir_pop_if(&b, NULL); - struct brw_cs_prog_key cs_key; - brw_blorp_init_cs_prog_key(&cs_key); - struct brw_cs_prog_data prog_data; const unsigned *program = - blorp_compile_cs(blorp, mem_ctx, b.shader, &cs_key, &prog_data); + blorp_compile_cs(blorp, mem_ctx, b.shader, &prog_data); bool result = blorp->upload_shader(batch, MESA_SHADER_COMPUTE, diff --git a/src/intel/blorp/blorp_priv.h b/src/intel/blorp/blorp_priv.h index 25ff7f201f8..a9210e2face 100644 --- a/src/intel/blorp/blorp_priv.h +++ b/src/intel/blorp/blorp_priv.h @@ -415,8 +415,6 @@ struct blorp_blit_prog_key bool blorp_blitter_supports_aux(const struct intel_device_info *devinfo, enum isl_aux_usage aux_usage); -void brw_blorp_init_cs_prog_key(struct brw_cs_prog_key *cs_key); - const char *blorp_shader_type_to_name(enum blorp_shader_type type); const char *blorp_shader_pipeline_to_name(enum blorp_shader_pipeline pipe); @@ -462,7 +460,6 @@ blorp_set_cs_dims(struct nir_shader *nir, uint8_t local_y) const unsigned * blorp_compile_cs(struct blorp_context *blorp, void *mem_ctx, struct nir_shader *nir, - struct brw_cs_prog_key *cs_key, struct brw_cs_prog_data *cs_prog_data); /** \} */