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

lavapipe: heap-allocate rendering_state struct

Browse source 
this thing is like 28k now, which is just way too big to have on the stack

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15233>
This commit is contained in:
Mike Blumenkrantz 2022-03-04 13:17:06 -05:00 • committed by Marge Bot
parent c82dcdf598
commit fcf58e75d0
3 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/frontends/lavapipe/lvp_device.c
View file

@ -1460,12 +1460,15 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDevice(
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO);
size_t state_size = lvp_get_rendering_state_size();
device = vk_zalloc2(&physical_device->vk.instance->alloc, pAllocator,
sizeof(*device), 8,
sizeof(*device) + state_size, 8,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!device)
return vk_error(instance, VK_ERROR_OUT_OF_HOST_MEMORY);
device->queue.state = device + 1;
struct vk_device_dispatch_table dispatch_table;
vk_device_dispatch_table_from_entrypoints(&dispatch_table,
&lvp_device_entrypoints, true);

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

@ -4140,45 +4140,51 @@ VkResult lvp_execute_cmds(struct lvp_device *device,
struct lvp_queue *queue,
struct lvp_cmd_buffer *cmd_buffer)
{
struct rendering_state state;
memset(&state, 0, sizeof(state));
state.pctx = queue->ctx;
state.cso = queue->cso;
state.blend_dirty = true;
state.dsa_dirty = true;
state.rs_dirty = true;
state.vp_dirty = true;
struct rendering_state *state = queue->state;
memset(state, 0, sizeof(*state));
state->pctx = queue->ctx;
state->cso = queue->cso;
state->blend_dirty = true;
state->dsa_dirty = true;
state->rs_dirty = true;
state->vp_dirty = true;
for (enum pipe_shader_type s = PIPE_SHADER_VERTEX; s < PIPE_SHADER_TYPES; s++) {
for (unsigned i = 0; i < PIPE_MAX_SAMPLERS; i++)
state.cso_ss_ptr[s][i] = &state.ss[s][i];
state->cso_ss_ptr[s][i] = &state->ss[s][i];
}
/* create a gallium context */
lvp_execute_cmd_buffer(cmd_buffer, &state);
lvp_execute_cmd_buffer(cmd_buffer, state);
state.start_vb = -1;
state.num_vb = 0;
state->start_vb = -1;
state->num_vb = 0;
cso_unbind_context(queue->cso);
for (unsigned i = 0; i < PIPE_MAX_SO_BUFFERS; i++) {
if (state.so_targets[i]) {
state.pctx->stream_output_target_destroy(state.pctx, state.so_targets[i]);
if (state->so_targets[i]) {
state->pctx->stream_output_target_destroy(state->pctx, state->so_targets[i]);
}
}
for (enum pipe_shader_type s = PIPE_SHADER_VERTEX; s < PIPE_SHADER_TYPES; s++) {
for (unsigned i = 0; i < PIPE_MAX_SAMPLERS; i++) {
if (state.sv[s][i])
pipe_sampler_view_reference(&state.sv[s][i], NULL);
if (state->sv[s][i])
pipe_sampler_view_reference(&state->sv[s][i], NULL);
}
}
for (unsigned i = 0; i < PIPE_MAX_SAMPLERS; i++) {
if (state.cso_ss_ptr[PIPE_SHADER_COMPUTE][i])
state.pctx->delete_sampler_state(state.pctx, state.ss_cso[PIPE_SHADER_COMPUTE][i]);
if (state->cso_ss_ptr[PIPE_SHADER_COMPUTE][i])
state->pctx->delete_sampler_state(state->pctx, state->ss_cso[PIPE_SHADER_COMPUTE][i]);
}
free(state.imageless_views);
free(state.pending_clear_aspects);
free(state.cleared_views);
free(state.attachments);
free(state->imageless_views);
free(state->pending_clear_aspects);
free(state->cleared_views);
free(state->attachments);
return VK_SUCCESS;
}
size_t
lvp_get_rendering_state_size(void)
{
return sizeof(struct rendering_state);
}

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

@ -169,6 +169,7 @@ struct lvp_queue {
uint64_t last_fence_timeline;
struct pipe_fence_handle *last_fence;
volatile int count;
void *state;
};
struct lvp_semaphore_wait {
@ -650,7 +651,8 @@ struct lvp_cmd_push_descriptor_set {
VkResult lvp_execute_cmds(struct lvp_device *device,
struct lvp_queue *queue,
struct lvp_cmd_buffer *cmd_buffer);
size_t
lvp_get_rendering_state_size(void);
struct lvp_image *lvp_swapchain_get_image(VkSwapchainKHR swapchain,
uint32_t index);