KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/mesa: replace st->pipe with pipe in a few places 

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8180>
This commit is contained in:
Marek Olšák 2020-12-20 03:12:47 -05:00
parent 4c52aba41e
commit fab62bb518
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/state_tracker/st_atom_constbuf.c
View File

@ -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 * but matrix rows are sometimes allocated partially, so add 12
* to compensate for the fetch_state defect. * 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); &cb.buffer_offset, &cb.buffer, (void**)&ptr);
int uniform_bytes = params->UniformBytes; int uniform_bytes = params->UniformBytes;
@ -121,7 +121,7 @@ st_upload_constants(struct st_context *st, struct gl_program *prog)
if (params->StateFlags) if (params->StateFlags)
_mesa_upload_state_parameters(st->ctx, params, ptr); _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->set_constant_buffer(pipe, shader_type, 0, &cb);
pipe_resource_reference(&cb.buffer, NULL); pipe_resource_reference(&cb.buffer, NULL);

12
src/mesa/state_tracker/st_atom_texture.c
View File

@ -198,7 +198,7 @@ update_textures(struct st_context *st,
tmpl.swizzle_g = PIPE_SWIZZLE_Y; /* tmpl from Y plane is R8 */ tmpl.swizzle_g = PIPE_SWIZZLE_Y; /* tmpl from Y plane is R8 */
extra = u_bit_scan(&free_slots); extra = u_bit_scan(&free_slots);
sampler_views[extra] = sampler_views[extra] =
st->pipe->create_sampler_view(st->pipe, stObj->pt->next, &tmpl); pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
break; break;
case PIPE_FORMAT_P010: case PIPE_FORMAT_P010:
case PIPE_FORMAT_P012: 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 */ tmpl.swizzle_g = PIPE_SWIZZLE_Y; /* tmpl from Y plane is R16 */
extra = u_bit_scan(&free_slots); extra = u_bit_scan(&free_slots);
sampler_views[extra] = sampler_views[extra] =
st->pipe->create_sampler_view(st->pipe, stObj->pt->next, &tmpl); pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
break; break;
case PIPE_FORMAT_IYUV: case PIPE_FORMAT_IYUV:
/* we need two additional R8 views: */ /* we need two additional R8 views: */
tmpl.format = PIPE_FORMAT_R8_UNORM; tmpl.format = PIPE_FORMAT_R8_UNORM;
extra = u_bit_scan(&free_slots); extra = u_bit_scan(&free_slots);
sampler_views[extra] = 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); extra = u_bit_scan(&free_slots);
sampler_views[extra] = 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; break;
case PIPE_FORMAT_YUYV: case PIPE_FORMAT_YUYV:
/* we need one additional BGRA8888 view: */ /* we need one additional BGRA8888 view: */
@ -227,7 +227,7 @@ update_textures(struct st_context *st,
tmpl.swizzle_a = PIPE_SWIZZLE_W; tmpl.swizzle_a = PIPE_SWIZZLE_W;
extra = u_bit_scan(&free_slots); extra = u_bit_scan(&free_slots);
sampler_views[extra] = sampler_views[extra] =
st->pipe->create_sampler_view(st->pipe, stObj->pt->next, &tmpl); pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
break; break;
case PIPE_FORMAT_UYVY: case PIPE_FORMAT_UYVY:
/* we need one additional RGBA8888 view: */ /* we need one additional RGBA8888 view: */
@ -236,7 +236,7 @@ update_textures(struct st_context *st,
tmpl.swizzle_a = PIPE_SWIZZLE_W; tmpl.swizzle_a = PIPE_SWIZZLE_W;
extra = u_bit_scan(&free_slots); extra = u_bit_scan(&free_slots);
sampler_views[extra] = sampler_views[extra] =
st->pipe->create_sampler_view(st->pipe, stObj->pt->next, &tmpl); pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
break; break;
default: default:
break; break;