From 19574a8156463df8e032cf64c4397546bc7cfe8b Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Tue, 30 Jan 2024 11:29:26 -0800 Subject: [PATCH] iris: Use uint32_t instead of brw_param_builtin Reviewed-by: Kenneth Graunke Part-of: --- src/gallium/drivers/iris/iris_context.h | 4 ++-- src/gallium/drivers/iris/iris_disk_cache.c | 6 +++--- src/gallium/drivers/iris/iris_program.c | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index 0b25af98d60..c6d20117d93 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -667,7 +667,7 @@ struct iris_compiled_shader { struct brw_stage_prog_data *brw_prog_data; /** A list of system values to be uploaded as uniforms. */ - enum brw_param_builtin *system_values; + uint32_t *system_values; unsigned num_system_values; /** Size (in bytes) of the kernel input data */ @@ -1354,7 +1354,7 @@ struct iris_compiled_shader *iris_create_shader_variant(const struct iris_screen void iris_finalize_program(struct iris_compiled_shader *shader, uint32_t *streamout, - enum brw_param_builtin *system_values, + uint32_t *system_values, unsigned num_system_values, unsigned kernel_input_size, unsigned num_cbufs, diff --git a/src/gallium/drivers/iris/iris_disk_cache.c b/src/gallium/drivers/iris/iris_disk_cache.c index ceb5df5114d..5c8182ee5f1 100644 --- a/src/gallium/drivers/iris/iris_disk_cache.c +++ b/src/gallium/drivers/iris/iris_disk_cache.c @@ -124,7 +124,7 @@ iris_disk_cache_store(struct disk_cache *cache, blob_write_bytes(&blob, shader->map, shader->program_size); blob_write_uint32(&blob, shader->num_system_values); blob_write_bytes(&blob, shader->system_values, - shader->num_system_values * sizeof(enum brw_param_builtin)); + shader->num_system_values * sizeof(uint32_t)); blob_write_uint32(&blob, shader->kernel_input_size); blob_write_bytes(&blob, prog_data->relocs, prog_data->num_relocs * sizeof(struct brw_shader_reloc)); @@ -199,9 +199,9 @@ iris_disk_cache_retrieve(struct iris_screen *screen, num_system_values = blob_read_uint32(&blob); if (num_system_values) { system_values = - ralloc_array(NULL, enum brw_param_builtin, num_system_values); + ralloc_array(NULL, uint32_t, num_system_values); blob_copy_bytes(&blob, system_values, - num_system_values * sizeof(enum brw_param_builtin)); + num_system_values * sizeof(uint32_t)); } kernel_input_size = blob_read_uint32(&blob); diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index e45c6874be0..e011b39831e 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -275,7 +275,7 @@ iris_apply_brw_prog_data(struct iris_compiled_shader *shader, void iris_finalize_program(struct iris_compiled_shader *shader, uint32_t *streamout, - enum brw_param_builtin *system_values, + uint32_t *system_values, unsigned num_system_values, unsigned kernel_input_size, unsigned num_cbufs, @@ -637,7 +637,7 @@ iris_setup_uniforms(ASSERTED const struct intel_device_info *devinfo, void *mem_ctx, nir_shader *nir, unsigned kernel_input_size, - enum brw_param_builtin **out_system_values, + uint32_t **out_system_values, unsigned *out_num_system_values, unsigned *out_num_cbufs) { @@ -645,8 +645,8 @@ iris_setup_uniforms(ASSERTED const struct intel_device_info *devinfo, const unsigned IRIS_MAX_SYSTEM_VALUES = PIPE_MAX_SHADER_IMAGES * ISL_IMAGE_PARAM_SIZE; - enum brw_param_builtin *system_values = - rzalloc_array(mem_ctx, enum brw_param_builtin, IRIS_MAX_SYSTEM_VALUES); + unsigned *system_values = + rzalloc_array(mem_ctx, unsigned, IRIS_MAX_SYSTEM_VALUES); unsigned num_system_values = 0; unsigned patch_vert_idx = -1; @@ -890,7 +890,7 @@ iris_setup_uniforms(ASSERTED const struct intel_device_info *devinfo, unsigned sysval_cbuf_index = num_cbufs; num_cbufs++; - system_values = reralloc(mem_ctx, system_values, enum brw_param_builtin, + system_values = reralloc(mem_ctx, system_values, unsigned, num_system_values); nir_foreach_block(block, impl) { @@ -1492,7 +1492,7 @@ iris_compile_vs(struct iris_screen *screen, const struct brw_compiler *compiler = screen->compiler; const struct intel_device_info *devinfo = screen->devinfo; void *mem_ctx = ralloc_context(NULL); - enum brw_param_builtin *system_values; + uint32_t *system_values; unsigned num_system_values; unsigned num_cbufs; @@ -1679,7 +1679,7 @@ iris_compile_tcs(struct iris_screen *screen, const struct brw_compiler *compiler = screen->compiler; void *mem_ctx = ralloc_context(NULL); const struct intel_device_info *devinfo = screen->devinfo; - enum brw_param_builtin *system_values = NULL; + uint32_t *system_values = NULL; unsigned num_system_values = 0; unsigned num_cbufs = 0; @@ -1840,7 +1840,7 @@ iris_compile_tes(struct iris_screen *screen, { const struct brw_compiler *compiler = screen->compiler; void *mem_ctx = ralloc_context(NULL); - enum brw_param_builtin *system_values; + uint32_t *system_values; const struct intel_device_info *devinfo = screen->devinfo; unsigned num_system_values; unsigned num_cbufs; @@ -1985,7 +1985,7 @@ iris_compile_gs(struct iris_screen *screen, const struct brw_compiler *compiler = screen->compiler; const struct intel_device_info *devinfo = screen->devinfo; void *mem_ctx = ralloc_context(NULL); - enum brw_param_builtin *system_values; + uint32_t *system_values; unsigned num_system_values; unsigned num_cbufs; @@ -2124,7 +2124,7 @@ iris_compile_fs(struct iris_screen *screen, { const struct brw_compiler *compiler = screen->compiler; void *mem_ctx = ralloc_context(NULL); - enum brw_param_builtin *system_values; + uint32_t *system_values; const struct intel_device_info *devinfo = screen->devinfo; unsigned num_system_values; unsigned num_cbufs; @@ -2422,7 +2422,7 @@ iris_compile_cs(struct iris_screen *screen, { const struct brw_compiler *compiler = screen->compiler; void *mem_ctx = ralloc_context(NULL); - enum brw_param_builtin *system_values; + uint32_t *system_values; const struct intel_device_info *devinfo = screen->devinfo; unsigned num_system_values; unsigned num_cbufs;