[Mesa-dev] [PATCH v2 17/73] radeonsi: add si_shader_selector::nir

[Marek Olšák]

For patches 9-17:

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Wed, Jul 5, 2017 at 12:48 PM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> ---
>  src/gallium/drivers/radeonsi/si_shader.h | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
> index a10067d..6de7b69 100644
> --- a/src/gallium/drivers/radeonsi/si_shader.h
> +++ b/src/gallium/drivers/radeonsi/si_shader.h
> @@ -136,20 +136,22 @@
>  #define SI_SHADER_H
>
>  #include <llvm-c/Core.h> /* LLVMModuleRef */
>  #include <llvm-c/TargetMachine.h>
>  #include "tgsi/tgsi_scan.h"
>  #include "util/u_queue.h"
>
>  #include "ac_binary.h"
>  #include "si_state.h"
>
> +struct nir_shader;
> +
>  #define SI_MAX_VS_OUTPUTS      40
>
>  /* Shader IO unique indices are supported for TGSI_SEMANTIC_GENERIC with an
>   * index smaller than this.
>   */
>  #define SI_MAX_IO_GENERIC       46
>
>  /* SGPR user data indices */
>  enum {
>         /* GFX9 merged shaders have RW_BUFFERS among the first 8 system SGPRs,
> @@ -313,20 +315,21 @@ struct si_shader_selector {
>         /* The compiled TGSI shader expecting a prolog and/or epilog (not
>          * uploaded to a buffer).
>          */
>         struct si_shader        *main_shader_part;
>         struct si_shader        *main_shader_part_ls; /* as_ls is set in the key */
>         struct si_shader        *main_shader_part_es; /* as_es is set in the key */
>
>         struct si_shader        *gs_copy_shader;
>
>         struct tgsi_token       *tokens;
> +       struct nir_shader       *nir;
>         struct pipe_stream_output_info  so;
>         struct tgsi_shader_info         info;
>
>         /* PIPE_SHADER_[VERTEX|FRAGMENT|...] */
>         unsigned        type;
>         bool            vs_needs_prolog;
>         unsigned        pa_cl_vs_out_cntl;
>         ubyte           clipdist_mask;
>         ubyte           culldist_mask;
>
> --
> 2.9.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev