[Mesa-dev] [PATCH 07/18] radeonsi: sort members of si_shader_key::part

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

and improve some comments
---
 src/gallium/drivers/radeonsi/si_shader.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index d4b57c9..b7cf7ea 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -416,43 +416,43 @@ union si_shader_part_key {
 		unsigned	writes_z:1;
 		unsigned	writes_stencil:1;
 		unsigned	writes_samplemask:1;
 	} ps_epilog;
 };
 
 struct si_shader_key {
 	/* Prolog and epilog flags. */
 	union {
 		struct {
-			struct si_ps_prolog_bits prolog;
-			struct si_ps_epilog_bits epilog;
-		} ps;
-		struct {
 			struct si_vs_prolog_bits prolog;
 			struct si_vs_epilog_bits epilog;
 		} vs;
 		struct {
 			struct si_tcs_epilog_bits epilog;
 		} tcs; /* tessellation control shader */
 		struct {
 			struct si_vs_epilog_bits epilog; /* same as VS */
 		} tes; /* tessellation evaluation shader */
 		struct {
 			struct si_gs_prolog_bits prolog;
 		} gs;
+		struct {
+			struct si_ps_prolog_bits prolog;
+			struct si_ps_epilog_bits epilog;
+		} ps;
 	} part;
 
 	/* These two are initially set according to the NEXT_SHADER property,
 	 * or guessed if the property doesn't seem correct.
 	 */
-	unsigned as_es:1; /* export shader */
-	unsigned as_ls:1; /* local shader */
+	unsigned as_es:1; /* export shader, which precedes GS */
+	unsigned as_ls:1; /* local shader, which precedes TCS */
 
 	/* Flags for monolithic compilation only. */
 	union {
 		struct {
 			/* One byte for every input: SI_FIX_FETCH_* enums. */
 			uint8_t		fix_fetch[SI_MAX_ATTRIBS];
 		} vs;
 		struct {
 			uint64_t	inputs_to_copy; /* for fixed-func TCS */
 		} tcs;
-- 
2.7.4