fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-17 21:10:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel/blorp: Add blorp_compile_cs

Browse source 
Reworks:
 * Don't pack params (s-b Jason)
 * Drop nir_remove_dead_variables (s-b Jason)
 * Fix comment s/render target/destination image/ (s-b Ken)

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11564>
This commit is contained in:
Jordan Justen 2018-10-26 12:38:57 -07:00 • committed by Marge Bot
parent 998142ea4a
commit dbd4934441
2 changed files with 58 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/intel/blorp/blorp.c
View file

@ -279,6 +279,56 @@ blorp_compile_vs(struct blorp_context *blorp, void *mem_ctx,
return brw_compile_vs(compiler, mem_ctx, &params);
}
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;
nir->options =
compiler->glsl_compiler_options[MESA_SHADER_COMPUTE].NirOptions;
memset(cs_prog_data, 0, sizeof(*cs_prog_data));
/* BLORP always uses the first two binding table entries:
* - Surface 0 is the destination image (which always start from 0)
* - Surface 1 is the source texture
*/
cs_prog_data->base.binding_table.texture_start = BLORP_TEXTURE_BT_INDEX;
brw_preprocess_nir(compiler, nir, NULL);
nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
NIR_PASS_V(nir, nir_lower_io, nir_var_uniform, type_size_scalar_bytes,
(nir_lower_io_options)0);
STATIC_ASSERT(offsetof(struct brw_blorp_wm_inputs, subgroup_id) + 4 ==
sizeof(struct brw_blorp_wm_inputs));
nir->num_uniforms = offsetof(struct brw_blorp_wm_inputs, subgroup_id);
unsigned nr_params = nir->num_uniforms / 4;
cs_prog_data->base.nr_params = nr_params;
cs_prog_data->base.param = rzalloc_array(NULL, uint32_t, nr_params);
NIR_PASS_V(nir, brw_nir_lower_cs_intrinsics);
struct brw_compile_cs_params params = {
.nir = nir,
.key = cs_key,
.prog_data = cs_prog_data,
.log_data = blorp->driver_ctx,
.debug_flag = DEBUG_BLORP,
};
const unsigned *program = brw_compile_cs(compiler, mem_ctx, &params);
ralloc_free(cs_prog_data->base.param);
cs_prog_data->base.param = NULL;
return program;
}
struct blorp_sf_key {
struct brw_blorp_base_key base;
struct brw_sf_prog_key key;

8
src/intel/blorp/blorp_priv.h
View file

@ -232,6 +232,8 @@ struct blorp_params
struct brw_sf_prog_data *sf_prog_data;
uint32_t wm_prog_kernel;
struct brw_wm_prog_data *wm_prog_data;
uint32_t cs_prog_kernel;
struct brw_cs_prog_data *cs_prog_data;
bool use_pre_baked_binding_table;
uint32_t pre_baked_binding_table_offset;
@ -418,6 +420,12 @@ bool
blorp_ensure_sf_program(struct blorp_batch *batch,
struct blorp_params *params);
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);
/** \} */
#ifdef __cplusplus