fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 15:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lavapipe: remove image pointer from lvp_image_view

Browse source 
Just use the underlying image pointer and pack the struct a bit
better.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38198>
This commit is contained in:
Dave Airlie 2025-11-02 05:27:48 +10:00
parent 9f0b57ce41
commit 8e01a11a00
3 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/gallium/frontends/lavapipe/lvp_execute.c
View file

@ -1296,10 +1296,11 @@ static struct pipe_surface create_img_surface(struct rendering_state *state,
VkFormat format,
int base_layer, int layer_count)
{
const struct lvp_image *image = (struct lvp_image *)imgv->vk.image;
VkImageSubresourceRange imgv_subres =
vk_image_view_subresource_range(&imgv->vk);
return create_img_surface_bo(state, &imgv_subres, imgv->image->planes[0].bo,
return create_img_surface_bo(state, &imgv_subres, image->planes[0].bo,
lvp_vk_format_to_pipe_format(format),
base_layer, layer_count, 0);
}
@ -1485,11 +1486,12 @@ slow_clear:
static struct lvp_image_view *
destroy_multisample_surface(struct rendering_state *state, struct lvp_image_view *imgv)
{
assert(imgv->image->vk.samples > 1);
struct lvp_image *image = (struct lvp_image *)imgv->vk.image;
assert(image->vk.samples > 1);
struct lvp_image_view *base = imgv->multisample;
pipe_resource_reference(&imgv->image->planes[0].bo, NULL);
pipe_resource_reference(&image->planes[0].bo, NULL);
base->multisample = NULL;
free((void*)imgv->image);
free((void*)image);
free(imgv);
return base;
}
@ -1503,9 +1505,10 @@ resolve_ds(struct rendering_state *state, bool multi)
return;
struct lvp_image_view *src_imgv = state->ds_imgv;
const struct lvp_image *src_image = (struct lvp_image *)src_imgv->vk.image;
if (multi && !src_imgv->multisample)
return;
if (!multi && src_imgv->image->vk.samples == 1)
if (!multi && src_imgv->vk.image->samples == 1)
return;
assert(state->depth_att.resolve_imgv == NULL ||
@ -1516,7 +1519,7 @@ resolve_ds(struct rendering_state *state, bool multi)
multi ? src_imgv->multisample :
state->depth_att.resolve_imgv ? state->depth_att.resolve_imgv :
state->stencil_att.resolve_imgv;
const struct lvp_image *dst_image = (struct lvp_image *)dst_imgv->vk.image;
unsigned num_blits = 1;
if (depth_resolve_mode != stencil_resolve_mode)
num_blits = 2;
@ -1530,8 +1533,8 @@ resolve_ds(struct rendering_state *state, bool multi)
struct pipe_blit_info info = {0};
info.src.resource = src_imgv->image->planes[0].bo;
info.dst.resource = dst_imgv->image->planes[0].bo;
info.src.resource = src_image->planes[0].bo;
info.dst.resource = dst_image->planes[0].bo;
info.src.format = src_imgv->pformat;
info.dst.format = dst_imgv->pformat;
info.filter = PIPE_TEX_FILTER_NEAREST;
@ -1571,15 +1574,17 @@ resolve_color(struct rendering_state *state, bool multi)
continue;
struct lvp_image_view *src_imgv = state->color_att[i].imgv;
const struct lvp_image *src_image = (struct lvp_image *)src_imgv->vk.image;
/* skip non-msrtss resolves during msrtss resolve */
if (multi && !src_imgv->multisample)
continue;
struct lvp_image_view *dst_imgv = multi ? src_imgv->multisample : state->color_att[i].resolve_imgv;
const struct lvp_image *dst_image = (struct lvp_image *)dst_imgv->vk.image;
struct pipe_blit_info info = { 0 };
info.src.resource = src_imgv->image->planes[0].bo;
info.dst.resource = dst_imgv->image->planes[0].bo;
info.src.resource = src_image->planes[0].bo;
info.dst.resource = dst_image->planes[0].bo;
info.src.format = src_imgv->pformat;
info.dst.format = dst_imgv->pformat;
info.filter = PIPE_TEX_FILTER_NEAREST;
@ -1624,17 +1629,19 @@ replicate_attachment(struct rendering_state *state,
struct lvp_image_view *src,
struct lvp_image_view *dst)
{
const struct lvp_image *src_image = (struct lvp_image *)src->vk.image;
const struct lvp_image *dst_image = (struct lvp_image *)dst->vk.image;
unsigned level = dst->surface.level;
const struct pipe_box box = {
.x = 0,
.y = 0,
.z = 0,
.width = u_minify(dst->image->planes[0].bo->width0, level),
.height = u_minify(dst->image->planes[0].bo->height0, level),
.depth = u_minify(dst->image->planes[0].bo->depth0, level),
.width = u_minify(dst_image->planes[0].bo->width0, level),
.height = u_minify(dst_image->planes[0].bo->height0, level),
.depth = u_minify(dst_image->planes[0].bo->depth0, level),
};
state->pctx->resource_copy_region(state->pctx, dst->image->planes[0].bo, level,
0, 0, 0, src->image->planes[0].bo, level, &box);
state->pctx->resource_copy_region(state->pctx, dst_image->planes[0].bo, level,
0, 0, 0, src_image->planes[0].bo, level, &box);
}
static struct lvp_image_view *
@ -1644,13 +1651,13 @@ create_multisample_surface(struct rendering_state *state, struct lvp_image_view
struct pipe_resource templ = *imgv->surface.texture;
templ.nr_samples = samples;
struct lvp_image *image = mem_dup(imgv->image, sizeof(struct lvp_image));
struct lvp_image *image = mem_dup(imgv->vk.image, sizeof(struct lvp_image));
image->vk.samples = samples;
image->planes[0].pmem = NULL;
image->planes[0].bo = state->pctx->screen->resource_create(state->pctx->screen, &templ);
struct lvp_image_view *multi = mem_dup(imgv, sizeof(struct lvp_image_view));
multi->image = image;
multi->vk.image = (struct vk_image *)image;
multi->surface = imgv->surface;
multi->surface.texture = image->planes[0].bo;
imgv->multisample = multi;
@ -1670,8 +1677,8 @@ att_needs_replicate(const struct rendering_state *state,
return true;
if (state->render_area.offset.x || state->render_area.offset.y)
return true;
if (state->render_area.extent.width < imgv->image->vk.extent.width ||
state->render_area.extent.height < imgv->image->vk.extent.height)
if (state->render_area.extent.width < imgv->vk.image->extent.width ||
state->render_area.extent.height < imgv->vk.image->extent.height)
return true;
return false;
}
@ -1767,7 +1774,7 @@ handle_begin_rendering(struct vk_cmd_queue_entry *cmd,
struct lvp_image_view *imgv = state->color_att[i].imgv;
add_img_view_surface(state, imgv,
state->framebuffer.layers);
if (state->forced_sample_count && imgv->image->vk.samples == 1)
if (state->forced_sample_count && imgv->vk.image->samples == 1)
state->color_att[i].imgv = create_multisample_surface(state, imgv, state->forced_sample_count,
att_needs_replicate(state, imgv, state->color_att[i].load_op));
state->framebuffer.cbufs[i] = state->color_att[i].imgv->surface;
@ -1791,7 +1798,7 @@ handle_begin_rendering(struct vk_cmd_queue_entry *cmd,
struct lvp_image_view *imgv = state->ds_imgv;
add_img_view_surface(state, imgv,
state->framebuffer.layers);
if (state->forced_sample_count && imgv->image->vk.samples == 1) {
if (state->forced_sample_count && imgv->vk.image->samples == 1) {
VkAttachmentLoadOp load_op;
if (state->depth_att.load_op == VK_ATTACHMENT_LOAD_OP_CLEAR ||
state->stencil_att.load_op == VK_ATTACHMENT_LOAD_OP_CLEAR)

9
src/gallium/frontends/lavapipe/lvp_image.c
View file

@ -274,6 +274,7 @@ lvp_create_samplerview(struct pipe_context *pctx, struct lvp_image_view *iv, VkF
if (!iv)
return NULL;
const struct lvp_image *image = (struct lvp_image *)iv->vk.image;
struct pipe_sampler_view templ;
enum pipe_format pformat;
if (iv->vk.aspects == VK_IMAGE_ASPECT_DEPTH_BIT)
@ -283,7 +284,7 @@ lvp_create_samplerview(struct pipe_context *pctx, struct lvp_image_view *iv, VkF
else
pformat = lvp_vk_format_to_pipe_format(plane_format);
u_sampler_view_default_template(&templ,
iv->image->planes[image_plane].bo,
image->planes[image_plane].bo,
pformat);
if (iv->vk.view_type == VK_IMAGE_VIEW_TYPE_1D)
templ.target = PIPE_TEXTURE_1D;
@ -316,7 +317,7 @@ lvp_create_samplerview(struct pipe_context *pctx, struct lvp_image_view *iv, VkF
templ.swizzle_a = conv_depth_swiz(templ.swizzle_a);
}
return pctx->create_sampler_view(pctx, iv->image->planes[image_plane].bo, &templ);
return pctx->create_sampler_view(pctx, image->planes[image_plane].bo, &templ);
}
static struct pipe_image_view
@ -326,7 +327,8 @@ lvp_create_imageview(const struct lvp_image_view *iv, VkFormat plane_format, uns
if (!iv)
return view;
view.resource = iv->image->planes[image_plane].bo;
const struct lvp_image *image = (struct lvp_image *)iv->vk.image;
view.resource = image->planes[image_plane].bo;
if (iv->vk.aspects == VK_IMAGE_ASPECT_DEPTH_BIT)
view.format = lvp_vk_format_to_pipe_format(plane_format);
else if (iv->vk.aspects == VK_IMAGE_ASPECT_STENCIL_BIT)
@ -384,7 +386,6 @@ lvp_CreateImageView(VkDevice _device,
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
view->pformat = lvp_vk_format_to_pipe_format(view->vk.format);
view->image = image;
view->surface.texture = NULL;
if (image->vk.aspects & (VK_IMAGE_ASPECT_DEPTH_BIT |

3
src/gallium/frontends/lavapipe/lvp_private.h
View file

@ -286,14 +286,13 @@ struct lvp_image {
struct lvp_image_view {
struct vk_image_view vk;
struct lvp_image *image; /**< VkImageViewCreateInfo::image */
enum pipe_format pformat;
uint8_t plane_count;
struct pipe_surface surface; /* have we created a pipe surface for this? */
struct lvp_image_view *multisample; //VK_EXT_multisampled_render_to_single_sampled
uint8_t plane_count;
struct {
unsigned image_plane;
struct pipe_sampler_view *sv;