diff options
| author | Timothy Arceri <[email protected]> | 2016-10-27 15:59:46 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-11-17 12:52:24 +1100 |
| commit | ba40c8b03cb5250af771c50ff785bd5ec293e3c1 (patch) | |
| tree | d352313b0489781f196bbf1d565d38345c423563 /src/mesa/drivers/dri/i965/brw_wm.c | |
| parent | 9c2042f2ce4c6f8746153138692fb06954ec2ed7 (diff) | |
i965: get num_images from shader_info rather than gl_linked_shader
This is a step towards freeing gl_linked_shader after linking.
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 14ecaa85871..e6f68c46f8b 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -107,8 +107,7 @@ brw_codegen_wm_prog(struct brw_context *brw, * by the state cache. */ int param_count = fp->program.nir->num_uniforms / 4; - if (fs) - prog_data.base.nr_image_params = fs->base.NumImages; + prog_data.base.nr_image_params = fp->program.info.num_images; /* The backend also sometimes adds params for texture size. */ param_count += 2 * ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits; prog_data.base.param = |