From: Iago Toral Quiroga Date: Thu, 7 Aug 2014 09:16:57 +0000 (+0200) Subject: i965/gen6/gs: upload ubo and pull constants surfaces. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3a4aee34a24a7af7cc2f2a75ca4f5eae533b6f88;p=mesa.git 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 Reviewed-by: Jordan Justen --- diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 49034a374b9..dd0ceb620d7 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,