From fab62bb518df152e233bca42f311e3b8e1982cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 20 Dec 2020 03:12:47 -0500 Subject: [PATCH] st/mesa: replace st->pipe with pipe in a few places MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Eric Anholt Reviewed-by: Zoltán Böszörményi Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mesa/state_tracker/st_atom_constbuf.c | 4 ++-- src/mesa/state_tracker/st_atom_texture.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c index bb8d16f1dac..cfa625d528d 100644 --- a/src/mesa/state_tracker/st_atom_constbuf.c +++ b/src/mesa/state_tracker/st_atom_constbuf.c @@ -108,7 +108,7 @@ st_upload_constants(struct st_context *st, struct gl_program *prog) * but matrix rows are sometimes allocated partially, so add 12 * to compensate for the fetch_state defect. */ - u_upload_alloc(st->pipe->const_uploader, 0, paramBytes + 12, 64, + u_upload_alloc(pipe->const_uploader, 0, paramBytes + 12, 64, &cb.buffer_offset, &cb.buffer, (void**)&ptr); int uniform_bytes = params->UniformBytes; @@ -121,7 +121,7 @@ st_upload_constants(struct st_context *st, struct gl_program *prog) if (params->StateFlags) _mesa_upload_state_parameters(st->ctx, params, ptr); - u_upload_unmap(st->pipe->const_uploader); + u_upload_unmap(pipe->const_uploader); pipe->set_constant_buffer(pipe, shader_type, 0, &cb); pipe_resource_reference(&cb.buffer, NULL); diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index 90c3007d8f5..2c8cf563033 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -198,7 +198,7 @@ update_textures(struct st_context *st, tmpl.swizzle_g = PIPE_SWIZZLE_Y; /* tmpl from Y plane is R8 */ extra = u_bit_scan(&free_slots); sampler_views[extra] = - st->pipe->create_sampler_view(st->pipe, stObj->pt->next, &tmpl); + pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl); break; case PIPE_FORMAT_P010: case PIPE_FORMAT_P012: @@ -208,17 +208,17 @@ update_textures(struct st_context *st, tmpl.swizzle_g = PIPE_SWIZZLE_Y; /* tmpl from Y plane is R16 */ extra = u_bit_scan(&free_slots); sampler_views[extra] = - st->pipe->create_sampler_view(st->pipe, stObj->pt->next, &tmpl); + pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl); break; case PIPE_FORMAT_IYUV: /* we need two additional R8 views: */ tmpl.format = PIPE_FORMAT_R8_UNORM; extra = u_bit_scan(&free_slots); sampler_views[extra] = - st->pipe->create_sampler_view(st->pipe, stObj->pt->next, &tmpl); + pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl); extra = u_bit_scan(&free_slots); sampler_views[extra] = - st->pipe->create_sampler_view(st->pipe, stObj->pt->next->next, &tmpl); + pipe->create_sampler_view(pipe, stObj->pt->next->next, &tmpl); break; case PIPE_FORMAT_YUYV: /* we need one additional BGRA8888 view: */ @@ -227,7 +227,7 @@ update_textures(struct st_context *st, tmpl.swizzle_a = PIPE_SWIZZLE_W; extra = u_bit_scan(&free_slots); sampler_views[extra] = - st->pipe->create_sampler_view(st->pipe, stObj->pt->next, &tmpl); + pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl); break; case PIPE_FORMAT_UYVY: /* we need one additional RGBA8888 view: */ @@ -236,7 +236,7 @@ update_textures(struct st_context *st, tmpl.swizzle_a = PIPE_SWIZZLE_W; extra = u_bit_scan(&free_slots); sampler_views[extra] = - st->pipe->create_sampler_view(st->pipe, stObj->pt->next, &tmpl); + pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl); break; default: break;