diff options
| author | Timothy Arceri <[email protected]> | 2016-11-04 20:02:21 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-01-06 11:21:40 +1100 |
| commit | a1da57c19c27505b9eab4792355f2f1b5c774a0a (patch) | |
| tree | acb5353c05fee5e416c4b2bdd993975818af7687 /src/mesa/state_tracker | |
| parent | 3d2485f011c4f1c7de35871ca359a84415bfcc06 (diff) | |
st/mesa/glsl/i965: move ImageUnits and ImageAccess fields to gl_program
Having it here rather than in gl_linked_shader allows us to simplify
the code.
Also it is error prone to depend on the gl_linked_shader for programs
in current use because a failed linking attempt will free infomation
about the current program. In i965 we could be trying to recompile
a shader variant but may have lost some required fields.
We drop the memset on ImageUnits because gl_program is already
created using rzalloc().
Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_image.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_image.c b/src/mesa/state_tracker/st_atom_image.c index a7b7371bfee..b30006a143c 100644 --- a/src/mesa/state_tracker/st_atom_image.c +++ b/src/mesa/state_tracker/st_atom_image.c @@ -58,7 +58,8 @@ st_bind_images(struct st_context *st, struct gl_linked_shader *shader, c = &st->ctx->Const.Program[shader->Stage]; for (i = 0; i < shader->NumImages; i++) { - struct gl_image_unit *u = &st->ctx->ImageUnits[shader->ImageUnits[i]]; + struct gl_image_unit *u = + &st->ctx->ImageUnits[shader->Program->sh.ImageUnits[i]]; struct st_texture_object *stObj = st_texture_object(u->TexObj); struct pipe_image_view *img = &images[i]; |