From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 14 Feb 2017 21:14:55 +0000 (+0100)
Subject: radeonsi: sort members of si_shader_key::part
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=054f853035bc3f4c3ff2b0732779fb21775893ef;p=mesa.git

radeonsi: sort members of si_shader_key::part

and improve some comments

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index d4b57c97d59..b7cf7ea7dbd 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -422,10 +422,6 @@ union si_shader_part_key {
 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;
@@ -439,13 +435,17 @@ struct si_shader_key {
 		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 {