diff options
| author | Timur Kristóf <[email protected]> | 2020-01-27 08:17:47 +0100 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-04-07 11:29:35 +0000 |
| commit | 1436c0b8e07898b0d5118f6959db57491a9a2a85 (patch) | |
| tree | 73f1e63369170edd15e57163fb01def26bc233db | |
| parent | 35e58314d8e4b7346c2523612f6e0f52cc964232 (diff) | |
aco/ngg: Add new stage for hw_ngg_gs.
This is needed to distinguish between NGG and legacy.
Otherwise, vertex_geometry_gs and ngg_vertex_geometry_gs
have the same value, which we want to avoid.
Also, there is no such thing as ngg_vertex_tess_control_hs.
Signed-off-by: Timur Kristóf <[email protected]>
Reviewed-by: Daniel Schürmann <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3576>
| -rw-r--r-- | src/amd/compiler/aco_ir.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h index 17ce7e39f1b..e9d7534088c 100644 --- a/src/amd/compiler/aco_ir.h +++ b/src/amd/compiler/aco_ir.h @@ -1287,13 +1287,14 @@ static constexpr Stage sw_mask = 0x7f; /* hardware stages (can't be OR'd, just a mask for convenience when testing multiple) */ static constexpr Stage hw_vs = 1 << 7; -static constexpr Stage hw_es = 1 << 8; /* not on GFX9. combined into GS on GFX9 (and GFX10/legacy). */ -static constexpr Stage hw_gs = 1 << 9; -static constexpr Stage hw_ls = 1 << 10; /* not on GFX9. combined into HS on GFX9 (and GFX10/legacy). */ -static constexpr Stage hw_hs = 1 << 11; -static constexpr Stage hw_fs = 1 << 12; -static constexpr Stage hw_cs = 1 << 13; -static constexpr Stage hw_mask = 0x7f << 7; +static constexpr Stage hw_es = 1 << 8; /* Export shader: pre-GS (VS or TES) on GFX6-8. Combined into GS on GFX9 (and GFX10/legacy). */ +static constexpr Stage hw_gs = 1 << 9; /* Geometry shader on GFX10/legacy and GFX6-9. */ +static constexpr Stage hw_ngg_gs = 1 << 10; /* Geometry shader on GFX10/NGG. */ +static constexpr Stage hw_ls = 1 << 11; /* Local shader: pre-TCS (VS) on GFX6-8. Combined into HS on GFX9 (and GFX10/legacy). */ +static constexpr Stage hw_hs = 1 << 12; /* Hull shader: TCS on GFX6-8. Merged VS and TCS on GFX9-10. */ +static constexpr Stage hw_fs = 1 << 13; +static constexpr Stage hw_cs = 1 << 14; +static constexpr Stage hw_mask = 0xff << 7; /* possible settings of Program::stage */ static constexpr Stage vertex_vs = sw_vs | hw_vs; @@ -1302,10 +1303,10 @@ static constexpr Stage compute_cs = sw_cs | hw_cs; static constexpr Stage tess_eval_vs = sw_tes | hw_vs; static constexpr Stage gs_copy_vs = sw_gs_copy | hw_vs; /* GFX10/NGG */ -static constexpr Stage ngg_vertex_gs = sw_vs | hw_gs; -static constexpr Stage ngg_vertex_geometry_gs = sw_vs | sw_gs | hw_gs; -static constexpr Stage ngg_tess_eval_geometry_gs = sw_tes | sw_gs | hw_gs; -static constexpr Stage ngg_vertex_tess_control_hs = sw_vs | sw_tcs | hw_hs; +static constexpr Stage ngg_vertex_gs = sw_vs | hw_ngg_gs; +static constexpr Stage ngg_vertex_geometry_gs = sw_vs | sw_gs | hw_ngg_gs; +static constexpr Stage ngg_tess_eval_gs = sw_tes | hw_ngg_gs; +static constexpr Stage ngg_tess_eval_geometry_gs = sw_tes | sw_gs | hw_ngg_gs; /* GFX9 (and GFX10 if NGG isn't used) */ static constexpr Stage vertex_geometry_gs = sw_vs | sw_gs | hw_gs; static constexpr Stage vertex_tess_control_hs = sw_vs | sw_tcs | hw_hs; |