[Mesa-dev] [PATCH 2/4] intel/blorp: Pass a brw_stage_prog_data to upload_shader

[Pohjolainen, Topi]

On Tue, Nov 01, 2016 at 08:09:11PM -0700, Jason Ekstrand wrote:
> ---
>  src/intel/blorp/blorp.h               | 5 +++--
>  src/intel/blorp/blorp_blit.c          | 2 +-
>  src/intel/blorp/blorp_clear.c         | 2 +-
>  src/intel/vulkan/anv_blorp.c          | 3 ++-
>  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;

This is just co-incidental cleanup then.

We keep on effectively passing the same pointer, now it just has fixed type
in the callee side. I prefer using properly typed pointers and:

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

> +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 d1e7212..1108335 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),
>                          &params->wm_prog_kernel, &params->wm_prog_data);
>  
>     ralloc_free(mem_ctx);
> diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c
> index b18b3d0..981c94d 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),
>                          &params->wm_prog_kernel, &params->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 60ae840..3c6b033 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;
> -- 
> 2.5.0.400.gff86faf
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev