X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fetnaviv%2Fetnaviv_compiler.h;h=b7feeb6d49b7be471c7ae1f23e86da12228230c1;hb=5f7c5f5dd202d27a0a1075e5e11858c960afce9c;hp=211ae1abdfefd54474dfb2cb5d7b8e1d6af6fc43;hpb=7256ed3c7967a1fc2a4f9ad23377ef4fe458095f;p=mesa.git

diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.h b/src/gallium/drivers/etnaviv/etnaviv_compiler.h
index 211ae1abdfe..b7feeb6d49b 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.h
@@ -29,8 +29,10 @@
 
 #include "etnaviv_context.h"
 #include "etnaviv_internal.h"
+#include "etnaviv_shader.h"
 #include "pipe/p_compiler.h"
 #include "pipe/p_shader_tokens.h"
+#include "compiler/shader_enums.h"
 
 /* XXX some of these are pretty arbitrary limits, may be better to switch
  * to dynamic allocation at some point.
@@ -46,6 +48,7 @@
 struct etna_shader_inout {
    int reg; /* native register */
    struct tgsi_declaration_semantic semantic; /* tgsi semantic name and index */
+   int slot; /* nir: gl_varying_slot or gl_vert_attrib */
    int num_components;
 };
 
@@ -55,8 +58,10 @@ struct etna_shader_io_file {
 };
 
 /* shader object, for linking */
-struct etna_shader {
-   uint processor; /* TGSI_PROCESSOR_... */
+struct etna_shader_variant {
+   uint32_t id; /* for debug */
+
+   gl_shader_stage stage;
    uint32_t code_size; /* code size in uint32 words */
    uint32_t *code;
    unsigned num_loops;
@@ -74,12 +79,13 @@ struct etna_shader {
    /* outputs (for linking) */
    struct etna_shader_io_file outfile;
 
-   /* index into outputs (for linking) */
+   /* index into outputs (for linking) - only for TGSI compiler */
    int output_count_per_semantic[TGSI_SEMANTIC_COUNT];
    struct etna_shader_inout * *output_per_semantic_list; /* list of pointers to outputs */
    struct etna_shader_inout **output_per_semantic[TGSI_SEMANTIC_COUNT];
 
-   /* special outputs (vs only) */
+   /* special inputs/outputs (vs only) */
+   int vs_id_in_reg; /* vertexid+instanceid input */
    int vs_pos_out_reg; /* VS position output */
    int vs_pointsize_out_reg; /* VS point size output */
    uint32_t vs_load_balancing;
@@ -90,6 +96,18 @@ struct etna_shader {
 
    /* unknown input property (XX_INPUT_COUNT, field UNK8) */
    uint32_t input_count_unk8;
+
+   /* shader is larger than GPU instruction limit, thus needs icache */
+   bool needs_icache;
+
+   /* shader variants form a linked list */
+   struct etna_shader_variant *next;
+
+   /* replicated here to avoid passing extra ptrs everywhere */
+   struct etna_shader *shader;
+   struct etna_shader_key key;
+
+   struct etna_bo *bo; /* cached code memory bo handle (for icache) */
 };
 
 struct etna_varying {
@@ -103,19 +121,36 @@ struct etna_shader_link_info {
    /* each PS input is annotated with the VS output reg */
    unsigned num_varyings;
    struct etna_varying varyings[ETNA_NUM_INPUTS];
+   int pcoord_varying_comp_ofs;
 };
 
-struct etna_shader *
-etna_compile_shader(const struct etna_specs *specs, const struct tgsi_token *tokens);
+bool
+etna_compile_shader(struct etna_shader_variant *shader);
 
 void
-etna_dump_shader(const struct etna_shader *shader);
+etna_dump_shader(const struct etna_shader_variant *shader);
 
 bool
 etna_link_shader(struct etna_shader_link_info *info,
-                 const struct etna_shader *vs, const struct etna_shader *fs);
+                 const struct etna_shader_variant *vs, const struct etna_shader_variant *fs);
+
+void
+etna_destroy_shader(struct etna_shader_variant *shader);
+
+/* NIR compiler */
+
+bool
+etna_compile_shader_nir(struct etna_shader_variant *shader);
+
+void
+etna_dump_shader_nir(const struct etna_shader_variant *shader);
+
+bool
+etna_link_shader_nir(struct etna_shader_link_info *info,
+                     const struct etna_shader_variant *vs,
+                     const struct etna_shader_variant *fs);
 
 void
-etna_destroy_shader(struct etna_shader *shader);
+etna_destroy_shader_nir(struct etna_shader_variant *shader);
 
 #endif