summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_state_upload.c
diff options
context:
space:
mode:
authorIago Toral Quiroga <itoral@igalia.com>2014-08-07 11:16:57 +0200
committerIago Toral Quiroga <itoral@igalia.com>2014-09-19 15:01:16 +0200
commit3a4aee34a24a7af7cc2f2a75ca4f5eae533b6f88 (patch)
tree7120839a74a2dae27126586de272ae2787241727 /src/mesa/drivers/dri/i965/brw_state_upload.c
parent6947a8a593ce1252ef380d653f29f8e225ef8b83 (diff)
downloadexternal_mesa3d-3a4aee34a24a7af7cc2f2a75ca4f5eae533b6f88.zip
external_mesa3d-3a4aee34a24a7af7cc2f2a75ca4f5eae533b6f88.tar.gz
external_mesa3d-3a4aee34a24a7af7cc2f2a75ca4f5eae533b6f88.tar.bz2
i965/gen6/gs: upload ubo and pull constants surfaces.
Uniforms declared as uniform blocks are stored in ubo surfaces and need to be pulled from the geometry shader program so make sure we upload them first and do the same for pull constants. This fixes all piglit tests that use uniform blocks: bin/shader_runner tests/spec/glsl-1.50/uniform_buffer/gs-* Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_state_upload.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_state_upload.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index 49034a3..dd0ceb6 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -136,6 +136,8 @@ static const struct brw_tracked_state *gen6_atoms[] =
*/
&brw_vs_pull_constants,
&brw_vs_ubo_surfaces,
+ &brw_gs_pull_constants,
+ &brw_gs_ubo_surfaces,
&brw_wm_pull_constants,
&brw_wm_ubo_surfaces,
&gen6_renderbuffer_surfaces,