r600: refactor step 11 - change r600_aligned_buffer_create() return type

Signed-off-by: Patrick Lerda <patrick9876@free.fr>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35967>
This commit is contained in:
Patrick Lerda 2025-07-17 00:29:36 +02:00 committed by Marge Bot
parent 490abd0a26
commit e2fbf1f473
4 changed files with 14 additions and 14 deletions

View file

@ -570,7 +570,7 @@ struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
return &rbuffer->b.b;
}
struct pipe_resource *r600_aligned_buffer_create(struct pipe_screen *screen,
struct r600_resource *r600_aligned_buffer_create(struct pipe_screen *screen,
unsigned flags,
unsigned usage,
unsigned size,
@ -588,7 +588,7 @@ struct pipe_resource *r600_aligned_buffer_create(struct pipe_screen *screen,
buffer.height0 = 1;
buffer.depth0 = 1;
buffer.array_size = 1;
return r600_buffer_create(screen, &buffer, alignment);
return r600_as_resource(r600_buffer_create(screen, &buffer, alignment));
}
struct pipe_resource *

View file

@ -704,7 +704,7 @@ void r600_buffer_flush_region(struct pipe_context *ctx,
struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
const struct pipe_resource *templ,
unsigned alignment);
struct pipe_resource * r600_aligned_buffer_create(struct pipe_screen *screen,
struct r600_resource * r600_aligned_buffer_create(struct pipe_screen *screen,
unsigned flags,
unsigned usage,
unsigned size,

View file

@ -982,9 +982,9 @@ static void r600_init_color_surface(struct r600_context *rctx,
r600_resource_reference(&rctx->dummy_cmask, NULL);
rctx->dummy_cmask =
r600_as_resource(r600_aligned_buffer_create(&rscreen->b.b, 0,
PIPE_USAGE_DEFAULT,
cmask.size, cmask.alignment));
r600_aligned_buffer_create(&rscreen->b.b, 0,
PIPE_USAGE_DEFAULT,
cmask.size, cmask.alignment);
if (unlikely(!rctx->dummy_cmask)) {
return;
@ -1003,9 +1003,9 @@ static void r600_init_color_surface(struct r600_context *rctx,
(1 << rctx->dummy_fmask->buf->alignment_log2) % fmask.alignment != 0) {
r600_resource_reference(&rctx->dummy_fmask, NULL);
rctx->dummy_fmask =
r600_as_resource(r600_aligned_buffer_create(&rscreen->b.b, 0,
PIPE_USAGE_DEFAULT,
fmask.size, fmask.alignment));
r600_aligned_buffer_create(&rscreen->b.b, 0,
PIPE_USAGE_DEFAULT,
fmask.size, fmask.alignment);
if (unlikely(!rctx->dummy_fmask)) {
return;

View file

@ -703,11 +703,11 @@ void r600_texture_alloc_cmask_separate(struct r600_common_screen *rscreen,
r600_texture_get_cmask_info(rscreen, rtex, &rtex->cmask);
rtex->cmask_buffer =
r600_as_resource(r600_aligned_buffer_create(&rscreen->b,
R600_RESOURCE_FLAG_UNMAPPABLE,
PIPE_USAGE_DEFAULT,
rtex->cmask.size,
rtex->cmask.alignment));
r600_aligned_buffer_create(&rscreen->b,
R600_RESOURCE_FLAG_UNMAPPABLE,
PIPE_USAGE_DEFAULT,
rtex->cmask.size,
rtex->cmask.alignment);
if (rtex->cmask_buffer == NULL) {
rtex->cmask.size = 0;
return;