fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 21:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lavapipe: replace hard pointer calcs in dynamic render with ptralloc

Browse source 
Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13678>
This commit is contained in:
Mike Blumenkrantz 2021-11-04 12:33:45 -04:00 • committed by Marge Bot
parent 171ccdbf1c
commit 48fde98b79
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@
#include "util/u_prim.h"
#include "util/u_prim_restart.h"
#include "util/format/u_format_zs.h"
#include "util/ptralloc.h"
#include "vk_util.h"
@ -1853,19 +1854,22 @@ static void handle_begin_rendering(struct vk_cmd_queue_entry *cmd,
state->cleared_views = realloc(state->cleared_views, sizeof(uint32_t) * attachment_count);
state->num_pending_aspects = attachment_count;
}
/* [lvp_subpass] [attachment_count * lvp_render_pass_attachment] [attachment_count * lvp_render_pass_attachment*] */
size_t size = sizeof(struct lvp_subpass) + attachment_count * (sizeof(void*) + sizeof(struct lvp_render_pass_attachment));
size_t attachment_offset = sizeof(struct lvp_subpass);
size_t attachment_ref_offset = attachment_offset + attachment_count * sizeof(struct lvp_render_pass_attachment);
struct lvp_subpass *subpass = calloc(1, size);
subpass->color_count = info->colorAttachmentCount;
bool has_ds = !!info->pDepthAttachment + !!info->pStencilAttachment;
state->attachments = realloc(state->attachments, sizeof(*state->attachments) * attachment_count);
struct lvp_render_pass_attachment *attachments = (void*)((uint8_t*)subpass + attachment_offset);
struct lvp_render_pass_attachment *attachments;
struct lvp_render_pass_attachment **attachment_refs;
/* [lvp_subpass] [attachment_count * lvp_render_pass_attachment] [attachment_count * lvp_render_pass_attachment*] */
size_t sizes[] = {attachment_count * sizeof(struct lvp_render_pass_attachment*), attachment_count * sizeof(struct lvp_render_pass_attachment)};
void **ptrs[] = {(void**)&attachments, (void**)&attachment_refs};
struct lvp_subpass *subpass = ptrzalloc(sizeof(struct lvp_subpass), 2, sizes, ptrs);
if (!subpass) {
mesa_loge("lavapipe: out of memory!");
return;
}
bool has_ds = !!info->pDepthAttachment + !!info->pStencilAttachment;
struct lvp_render_pass_attachment *resolve_attachments = num_resolves ? &attachments[subpass->color_count + has_ds] : NULL;
struct lvp_render_pass_attachment **attachment_refs = (void*)((uint8_t*)subpass + attachment_ref_offset);
struct lvp_render_pass_attachment **resolve_attachment_refs = num_resolves ? &attachment_refs[subpass->color_count + has_ds] : NULL;
subpass->color_count = info->colorAttachmentCount;
subpass->view_mask = info->viewMask;
subpass->has_color_resolve = color_resolves > 0;