diff options
author | Timothy Arceri <[email protected]> | 2016-11-05 09:24:51 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-01-06 11:21:41 +1100 |
commit | f62eb6c7eb22cd97c691ebdb5f25eb5fe8e9ed11 (patch) | |
tree | 6ffcf849dfef0c490d475a880a8208a4ab2fbf9b /src/mesa/drivers/dri/i965/brw_wm_surface_state.c | |
parent | 0e7eec1ab5f27ced1aa4b2d77c2c63512d299694 (diff) |
st/mesa/glsl/i965: set num_ssbos directly in shader_info
Here we also remove the duplicate field in gl_linked_shader and always
get the value from shader_info instead.
Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm_surface_state.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 4 |
1 files changed, 2 insertions, 2 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 2140312a802..28cb2ca2bd4 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -1408,7 +1408,7 @@ brw_upload_ubo_surfaces(struct brw_context *brw, uint32_t *ssbo_surf_offsets = &stage_state->surf_offset[prog_data->binding_table.ssbo_start]; - for (int i = 0; i < shader->NumShaderStorageBlocks; i++) { + for (int i = 0; i < shader->Program->info.num_ssbos; i++) { struct gl_shader_storage_buffer_binding *binding = &ctx->ShaderStorageBufferBindings[shader->ShaderStorageBlocks[i]->Binding]; @@ -1430,7 +1430,7 @@ brw_upload_ubo_surfaces(struct brw_context *brw, } } - if (shader->Program->info.num_ubos || shader->NumShaderStorageBlocks) + if (shader->Program->info.num_ubos || shader->Program->info.num_ssbos) brw->ctx.NewDriverState |= BRW_NEW_SURFACES; } |