Mesa (main): aco/info: add some more fields.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 199edce84ddc98914715c45efb3ef7111696b3d8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=199edce84ddc98914715c45efb3ef7111696b3d8

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu May  5 12:42:03 2022 +1000

aco/info: add some more fields.

These fields are also used in aco.

Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16342>

---

 src/amd/compiler/aco_shader_info.h    | 5 +++++
 src/amd/vulkan/radv_aco_shader_info.h | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/amd/compiler/aco_shader_info.h b/src/amd/compiler/aco_shader_info.h
index e46a7be5253..fea4a29ce8e 100644
--- a/src/amd/compiler/aco_shader_info.h
+++ b/src/amd/compiler/aco_shader_info.h
@@ -68,12 +68,16 @@ struct aco_streamout_info {
 };
 
 struct aco_shader_info {
+   uint8_t wave_size;
+   bool is_ngg;
    bool has_ngg_culling;
    bool has_ngg_early_prim_export;
    uint32_t num_tess_patches;
    unsigned workgroup_size;
    struct {
       struct aco_vp_output_info outinfo;
+      bool as_es;
+      bool as_ls;
       bool tcs_in_out_eq;
       uint64_t tcs_temp_only_input_mask;
       bool use_per_attribute_vb_descs;
@@ -92,6 +96,7 @@ struct aco_shader_info {
    } tcs;
    struct {
       struct aco_vp_output_info outinfo;
+      bool as_es;
    } tes;
    struct {
       bool writes_z;
diff --git a/src/amd/vulkan/radv_aco_shader_info.h b/src/amd/vulkan/radv_aco_shader_info.h
index 20975f07ba8..c69c69a86de 100644
--- a/src/amd/vulkan/radv_aco_shader_info.h
+++ b/src/amd/vulkan/radv_aco_shader_info.h
@@ -71,11 +71,15 @@ static inline void
 radv_aco_convert_shader_info(struct aco_shader_info *aco_info,
 			     const struct radv_shader_info *radv)
 {
+   ASSIGN_FIELD(wave_size);
+   ASSIGN_FIELD(is_ngg);
    ASSIGN_FIELD(has_ngg_culling);
    ASSIGN_FIELD(has_ngg_early_prim_export);
    ASSIGN_FIELD(num_tess_patches);
    ASSIGN_FIELD(workgroup_size);
    ASSIGN_OUTINFO(vs);
+   ASSIGN_FIELD(vs.as_es);
+   ASSIGN_FIELD(vs.as_ls);
    ASSIGN_FIELD(vs.tcs_in_out_eq);
    ASSIGN_FIELD(vs.tcs_temp_only_input_mask);
    ASSIGN_FIELD(vs.use_per_attribute_vb_descs);
@@ -88,6 +92,7 @@ radv_aco_convert_shader_info(struct aco_shader_info *aco_info,
    ASSIGN_FIELD(gs.vertices_out);
    ASSIGN_FIELD(tcs.num_lds_blocks);
    ASSIGN_OUTINFO(tes);
+   ASSIGN_FIELD(tes.as_es);
    ASSIGN_FIELD(ps.writes_z);
    ASSIGN_FIELD(ps.writes_stencil);
    ASSIGN_FIELD(ps.writes_sample_mask);