radeonsi: sort members of si_shader_key::part
authorMarek Olšák <marek.olsak@amd.com>
Tue, 14 Feb 2017 21:14:55 +0000 (22:14 +0100)
committerMarek Olšák <marek.olsak@amd.com>
Sat, 18 Feb 2017 00:22:08 +0000 (01:22 +0100)
and improve some comments

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/gallium/drivers/radeonsi/si_shader.h

index d4b57c97d59ecf32c2b79fff4bf41064de2b9d51..b7cf7ea7dbdee83fca034054853830e12017da17 100644 (file)
@@ -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 {