diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-11-01 14:16:34 -0700 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-11-09 13:41:32 +0000 |
| commit | 78fbafedf1bd619161e3f58cff2c1d412ae87bd1 (patch) | |
| tree | e4aa8f9bc0dc1b5f8e4e946ef9d2a6f4e4880b0f /src | |
| parent | 5be463694bfbeed3066601cbdb70825fe7e97859 (diff) | |
| download | external_mesa3d-78fbafedf1bd619161e3f58cff2c1d412ae87bd1.zip external_mesa3d-78fbafedf1bd619161e3f58cff2c1d412ae87bd1.tar.gz external_mesa3d-78fbafedf1bd619161e3f58cff2c1d412ae87bd1.tar.bz2 | |
intel/blorp: Pass a brw_stage_prog_data to upload_shader
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98012
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Cc: "13.0" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 4306c10a885bdd833328a2a4eeb0079aa4f4bae3)
Diffstat (limited to 'src')
| -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 0c64d13..4351cb1 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 4f30ff9..018d997 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -1255,7 +1255,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 cbc2a4f..7e5015a 100644 --- a/src/intel/blorp/blorp_clear.c +++ b/src/intel/blorp/blorp_clear.c @@ -82,7 +82,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 5361c4b..79153a3 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 9484574..cd2cc76 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; |