diff options
author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-11-05 08:55:57 +1100 |
---|---|---|
committer | Timothy Arceri <timothy.arceri@collabora.com> | 2017-01-06 11:21:41 +1100 |
commit | 0e7eec1ab5f27ced1aa4b2d77c2c63512d299694 (patch) | |
tree | 1cf0ae90e08fd5c0f177a773a62a74c39545223d /src/mesa/drivers | |
parent | b792c3897927c1d89968bc0040faef02ec976184 (diff) |
st/mesa/glsl/i965: move per stage UniformBlocks to gl_program
This will help allow us to store pointers to gl_program structs in the
CurrentProgram array resulting in a bunch of code simplifications.
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index e3a6033e01a..2140312a802 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -1385,7 +1385,7 @@ brw_upload_ubo_surfaces(struct brw_context *brw, for (int i = 0; i < shader->Program->info.num_ubos; i++) { struct gl_uniform_buffer_binding *binding = - &ctx->UniformBufferBindings[shader->UniformBlocks[i]->Binding]; + &ctx->UniformBufferBindings[shader->Program->sh.UniformBlocks[i]->Binding]; if (binding->BufferObject == ctx->Shared->NullBufferObj) { brw->vtbl.emit_null_surface_state(brw, 1, 1, 1, &ubo_surf_offsets[i]); |