diff options
| author | Dave Airlie <[email protected]> | 2017-09-15 12:43:55 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2017-10-11 09:10:20 +1000 |
| commit | d2bfa76045ae32c2191c8d2354413ef226ace4ca (patch) | |
| tree | 263fb23354a5387074a6177127e956649e938f14 /src/mesa/drivers | |
| parent | 65d3ef7cd4f3debbd51b8a8bc95b88fc32f18ded (diff) | |
mesa: rename various buffer bindings to one struct.
One binding to bind them all, these are all the same thing.
Reviewed-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Iago Toral Quiroga <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_state_upload.c | 2 |
2 files changed, 4 insertions, 4 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 ae74ff1845e..c9383b82245 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -1281,7 +1281,7 @@ brw_upload_ubo_surfaces(struct brw_context *brw, struct gl_program *prog, &stage_state->surf_offset[prog_data->binding_table.ubo_start]; for (int i = 0; i < prog->info.num_ubos; i++) { - struct gl_uniform_buffer_binding *binding = + struct gl_buffer_binding *binding = &ctx->UniformBufferBindings[prog->sh.UniformBlocks[i]->Binding]; if (binding->BufferObject == ctx->Shared->NullBufferObj) { @@ -1306,7 +1306,7 @@ brw_upload_ubo_surfaces(struct brw_context *brw, struct gl_program *prog, &stage_state->surf_offset[prog_data->binding_table.ssbo_start]; for (int i = 0; i < prog->info.num_ssbos; i++) { - struct gl_shader_storage_buffer_binding *binding = + struct gl_buffer_binding *binding = &ctx->ShaderStorageBufferBindings[prog->sh.ShaderStorageBlocks[i]->Binding]; if (binding->BufferObject == ctx->Shared->NullBufferObj) { @@ -1388,7 +1388,7 @@ brw_upload_abo_surfaces(struct brw_context *brw, if (prog->info.num_abos) { for (unsigned i = 0; i < prog->info.num_abos; i++) { - struct gl_atomic_buffer_binding *binding = + struct gl_buffer_binding *binding = &ctx->AtomicBufferBindings[prog->sh.AtomicBuffers[i]->Binding]; struct intel_buffer_object *intel_bo = intel_buffer_object(binding->BufferObject); diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index ecf5a9ae68d..fd9eb17b9f2 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -3074,7 +3074,7 @@ genX(upload_push_constant_packets)(struct brw_context *brw) const struct gl_uniform_block *block = prog->sh.UniformBlocks[range->block]; - const struct gl_uniform_buffer_binding *binding = + const struct gl_buffer_binding *binding = &ctx->UniformBufferBindings[block->Binding]; if (binding->BufferObject == ctx->Shared->NullBufferObj) { |