diff options
| -rw-r--r-- | src/intel/blorp/blorp.h | 5 | ||||
| -rw-r--r-- | src/intel/blorp/blorp_blit.c | 2 | ||||
| -rw-r--r-- | src/intel/blorp/blorp_clear.c | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_blorp.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_blorp.c | 3 |
5 files changed, 9 insertions, 6 deletions
diff --git a/src/intel/blorp/blorp.h b/src/intel/blorp/blorp.h index 0c64d13371b..4351cb18121 100644 --- a/src/intel/blorp/blorp.h +++ b/src/intel/blorp/blorp.h @@ -30,7 +30,7 @@ #include "isl/isl.h" struct brw_context; -struct brw_wm_prog_key; +struct brw_stage_prog_data; #ifdef __cplusplus extern "C" { @@ -58,7 +58,8 @@ struct blorp_context { void (*upload_shader)(struct blorp_context *blorp, const void *key, uint32_t key_size, const void *kernel, uint32_t kernel_size, - const void *prog_data, uint32_t prog_data_size, + const struct brw_stage_prog_data *prog_data, + uint32_t prog_data_size, uint32_t *kernel_out, void *prog_data_out); void (*exec)(struct blorp_batch *batch, const struct blorp_params *params); }; diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c index d1e7212d520..11083350dc5 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -1252,7 +1252,7 @@ brw_blorp_get_blit_kernel(struct blorp_context *blorp, blorp->upload_shader(blorp, prog_key, sizeof(*prog_key), program, program_size, - &prog_data, sizeof(prog_data), + &prog_data.base, sizeof(prog_data), ¶ms->wm_prog_kernel, ¶ms->wm_prog_data); ralloc_free(mem_ctx); diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c index b18b3d008ef..981c94dfec9 100644 --- a/src/intel/blorp/blorp_clear.c +++ b/src/intel/blorp/blorp_clear.c @@ -81,7 +81,7 @@ blorp_params_get_clear_kernel(struct blorp_context *blorp, blorp->upload_shader(blorp, &blorp_key, sizeof(blorp_key), program, program_size, - &prog_data, sizeof(prog_data), + &prog_data.base, sizeof(prog_data), ¶ms->wm_prog_kernel, ¶ms->wm_prog_data); ralloc_free(mem_ctx); diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c index 5361c4b2deb..79153a345fb 100644 --- a/src/intel/vulkan/anv_blorp.c +++ b/src/intel/vulkan/anv_blorp.c @@ -54,7 +54,8 @@ static void upload_blorp_shader(struct blorp_context *blorp, const void *key, uint32_t key_size, const void *kernel, uint32_t kernel_size, - const void *prog_data, uint32_t prog_data_size, + const struct brw_stage_prog_data *prog_data, + uint32_t prog_data_size, uint32_t *kernel_out, void *prog_data_out) { struct anv_device *device = blorp->driver_ctx; diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index 60ae8407911..3c6b033705a 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -52,7 +52,8 @@ static void brw_blorp_upload_shader(struct blorp_context *blorp, const void *key, uint32_t key_size, const void *kernel, uint32_t kernel_size, - const void *prog_data, uint32_t prog_data_size, + const struct brw_stage_prog_data *prog_data, + uint32_t prog_data_size, uint32_t *kernel_out, void *prog_data_out) { struct brw_context *brw = blorp->driver_ctx; |