st/mesa: consolidate and simplify code flagging program::affected_states

Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]>

1 files changed, 11 insertions, 6 deletions

diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 21ba2f41ac0..cf2f636df6e 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -244,12 +244,17 @@ struct st_context
     */
    unsigned active_queries;
 
-   struct st_vertex_program *vp;    /**< Currently bound vertex program */
-   struct st_common_program *fp;  /**< Currently bound fragment program */
-   struct st_common_program *gp;  /**< Currently bound geometry program */
-   struct st_common_program *tcp; /**< Currently bound tess control program */
-   struct st_common_program *tep; /**< Currently bound tess eval program */
-   struct st_common_program *cp;   /**< Currently bound compute program */
+   union {
+      struct {
+         struct st_vertex_program *vp;    /**< Currently bound vertex program */
+         struct st_common_program *tcp; /**< Currently bound tess control program */
+         struct st_common_program *tep; /**< Currently bound tess eval program */
+         struct st_common_program *gp;  /**< Currently bound geometry program */
+         struct st_common_program *fp;  /**< Currently bound fragment program */
+         struct st_common_program *cp;   /**< Currently bound compute program */
+      };
+      struct gl_program *current_program[MESA_SHADER_STAGES];
+   };
 
    struct st_vp_variant *vp_variant;