[Mesa-dev] [PATCH 3/3] st/mesa: don't use _NEW_PROGRAM where ST_NEW_xxx_PROGRAM is sufficient

[Marek Olšák]

---
 src/mesa/state_tracker/st_atom_array.c    |    2 +-
 src/mesa/state_tracker/st_atom_clip.c     |    4 ++--
 src/mesa/state_tracker/st_atom_constbuf.c |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c
index 86328e2..40c0a63 100644
--- a/src/mesa/state_tracker/st_atom_array.c
+++ b/src/mesa/state_tracker/st_atom_array.c
@@ -592,7 +592,7 @@ static void update_array(struct st_context *st)
 const struct st_tracked_state st_update_array = {
    "st_update_array",					/* name */
    {							/* dirty */
-      (_NEW_PROGRAM | _NEW_BUFFER_OBJECT | _NEW_CURRENT_ATTRIB), /* mesa */
+      (_NEW_BUFFER_OBJECT | _NEW_CURRENT_ATTRIB),       /* mesa */
       ST_NEW_VERTEX_ARRAYS | ST_NEW_VERTEX_PROGRAM,     /* st */
    },
    update_array						/* update */
diff --git a/src/mesa/state_tracker/st_atom_clip.c b/src/mesa/state_tracker/st_atom_clip.c
index a1a7e00..8558d76 100644
--- a/src/mesa/state_tracker/st_atom_clip.c
+++ b/src/mesa/state_tracker/st_atom_clip.c
@@ -67,8 +67,8 @@ static void update_clip( struct st_context *st )
 const struct st_tracked_state st_update_clip = {
    "st_update_clip",					/* name */
    {							/* dirty */
-      (_NEW_TRANSFORM | _NEW_PROGRAM),			/* mesa */
-      0,						/* st */
+      _NEW_TRANSFORM,                                   /* mesa */
+      ST_NEW_VERTEX_PROGRAM,				/* st */
    },
    update_clip						/* update */
 };
diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c
index fd92285..580393e 100644
--- a/src/mesa/state_tracker/st_atom_constbuf.c
+++ b/src/mesa/state_tracker/st_atom_constbuf.c
@@ -125,7 +125,7 @@ static void update_vs_constants(struct st_context *st )
 const struct st_tracked_state st_update_vs_constants = {
    "st_update_vs_constants",				/* name */
    {							/* dirty */
-      (_NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS),          /* mesa */
+      _NEW_PROGRAM_CONSTANTS,                           /* mesa */
       ST_NEW_VERTEX_PROGRAM,				/* st */
    },
    update_vs_constants					/* update */
@@ -148,7 +148,7 @@ static void update_fs_constants(struct st_context *st )
 const struct st_tracked_state st_update_fs_constants = {
    "st_update_fs_constants",				/* name */
    {							/* dirty */
-      (_NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS),          /* mesa */
+      _NEW_PROGRAM_CONSTANTS,                           /* mesa */
       ST_NEW_FRAGMENT_PROGRAM,				/* st */
    },
    update_fs_constants					/* update */
@@ -170,7 +170,7 @@ static void update_gs_constants(struct st_context *st )
 const struct st_tracked_state st_update_gs_constants = {
    "st_update_gs_constants",				/* name */
    {							/* dirty */
-      (_NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS),          /* mesa */
+      _NEW_PROGRAM_CONSTANTS,                           /* mesa */
       ST_NEW_GEOMETRY_PROGRAM,				/* st */
    },
    update_gs_constants					/* update */
-- 
1.7.9.5