summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2013-11-25 07:49:15 -0800
committerIan Romanick <ian.d.romanick@intel.com>2013-11-26 21:04:52 -0800
commit756b4f9a8c657c4ba93a0a082bd77a9c3390c11e (patch)
tree067247a7e992eef5f779b4a766ec166c7038e11b /src/mesa
parentd963daa3803db266c88ef8e0643f75a5e600ba19 (diff)
i965/gs: Set GS prog_data to NULL if there is no GS program.
The previous commit fixes a bug wherein we would incorrectly refer to stale geometry shader prog_data when no geometry shader was active. This patch reduces the likelihood of that sort of bug occurring in the future by setting prog_data to NULL whenever there is no GS program. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 37bdde1087584f4c1839e14db75c157b83246ebd)
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_gs.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs.c b/src/mesa/drivers/dri/i965/brw_vec4_gs.c
index b52d646aa00..018b0b67461 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs.c
@@ -259,6 +259,13 @@ brw_upload_gs_prog(struct brw_context *brw)
brw->vue_map_geom_out = brw->vue_map_vs;
brw->state.dirty.brw |= BRW_NEW_VUE_MAP_GEOM_OUT;
}
+
+ /* Other state atoms had better not try to access prog_data, since
+ * there's no GS program.
+ */
+ brw->gs.prog_data = NULL;
+ brw->gs.base.prog_data = NULL;
+
return;
}