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

radv: bind the vertex binding strides like a normal dynamic state

Browse source 
This is much cleaner.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37025>
This commit is contained in:
Samuel Pitoiset 2025-08-27 14:55:56 +02:00 • committed by Marge Bot
parent 9a5c540b75
commit d7f401c2bb
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -687,6 +687,17 @@ radv_cmd_set_color_blend_equation(struct radv_cmd_buffer *cmd_buffer, uint32_t f
state->dirty_dynamic |= RADV_DYNAMIC_COLOR_BLEND_EQUATION; state->dirty_dynamic |= RADV_DYNAMIC_COLOR_BLEND_EQUATION;
} }
ALWAYS_INLINE static void
radv_cmd_set_vertex_binding_strides(struct radv_cmd_buffer *cmd_buffer, uint32_t first, uint32_t count,
const uint16_t *strides)
{
struct radv_cmd_state *state = &cmd_buffer->state;
typed_memcpy(state->dynamic.vk.vi_binding_strides + first, strides, count);
state->dirty_dynamic |= RADV_DYNAMIC_VERTEX_INPUT_BINDING_STRIDE;
}
static void static void
radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dynamic_state *src) radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dynamic_state *src)
{ {
@ -1063,6 +1074,12 @@ radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dy
radv_cmd_set_attachment_feedback_loop_enable(cmd_buffer, src->feedback_loop_aspects); radv_cmd_set_attachment_feedback_loop_enable(cmd_buffer, src->feedback_loop_aspects);
} }
} }
if (copy_mask & RADV_DYNAMIC_VERTEX_INPUT_BINDING_STRIDE) {
if (memcmp(dest->vk.vi_binding_strides, src->vk.vi_binding_strides, sizeof(src->vk.vi_binding_strides))) {
radv_cmd_set_vertex_binding_strides(cmd_buffer, 0, MESA_VK_MAX_VERTEX_BINDINGS, src->vk.vi_binding_strides);
}
}
} }
bool bool
@ -7531,7 +7548,7 @@ radv_CmdBindVertexBuffers2(VkCommandBuffer commandBuffer, uint32_t firstBinding,
struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
struct radv_vertex_binding *vb = cmd_buffer->vertex_bindings; struct radv_vertex_binding *vb = cmd_buffer->vertex_bindings;
const struct radv_vertex_input_state *vi_state = &cmd_buffer->state.vertex_input; const struct radv_vertex_input_state *vi_state = &cmd_buffer->state.vertex_input;
struct radv_dynamic_state *d = &cmd_buffer->state.dynamic; const struct radv_dynamic_state *d = &cmd_buffer->state.dynamic;
struct radv_cmd_stream *cs = cmd_buffer->cs; struct radv_cmd_stream *cs = cmd_buffer->cs;
/* We have to defer setting up vertex buffer since we need the buffer /* We have to defer setting up vertex buffer since we need the buffer
@ -7555,10 +7572,9 @@ radv_CmdBindVertexBuffers2(VkCommandBuffer commandBuffer, uint32_t firstBinding,
vb[idx].addr = addr; vb[idx].addr = addr;
vb[idx].size = buffer ? vk_buffer_range(&buffer->vk, pOffsets[i], size) : 0; vb[idx].size = buffer ? vk_buffer_range(&buffer->vk, pOffsets[i], size) : 0;
/* if pStrides=NULL, it shouldn't overwrite the strides specified by CmdSetVertexInputEXT */ /* if pStrides=NULL, it shouldn't overwrite the strides specified by CmdSetVertexInputEXT */
if (pStrides) if (pStrides)
d->vk.vi_binding_strides[idx] = stride; radv_cmd_set_vertex_binding_strides(cmd_buffer, idx, 1, (uint16_t *)&pStrides[i]);
uint32_t bit = BITFIELD_BIT(idx); uint32_t bit = BITFIELD_BIT(idx);
if (buffer) { if (buffer) {
@ -7977,7 +7993,6 @@ radv_bind_vs_input_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_g
{ {
const struct radv_shader *vs_shader = radv_get_shader(cmd_buffer->state.shaders, MESA_SHADER_VERTEX); const struct radv_shader *vs_shader = radv_get_shader(cmd_buffer->state.shaders, MESA_SHADER_VERTEX);
const struct radv_vertex_input_state *src = &pipeline->vertex_input; const struct radv_vertex_input_state *src = &pipeline->vertex_input;
struct radv_dynamic_state *d = &cmd_buffer->state.dynamic;
/* Bind the vertex input state from the pipeline when it's static. */ /* Bind the vertex input state from the pipeline when it's static. */
if (!vs_shader || !vs_shader->info.vs.vb_desc_usage_mask || (pipeline->dynamic_states & RADV_DYNAMIC_VERTEX_INPUT)) if (!vs_shader || !vs_shader->info.vs.vb_desc_usage_mask || (pipeline->dynamic_states & RADV_DYNAMIC_VERTEX_INPUT))
@ -7985,11 +8000,6 @@ radv_bind_vs_input_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_g
cmd_buffer->state.vertex_input = *src; cmd_buffer->state.vertex_input = *src;
if (!(pipeline->dynamic_states & RADV_DYNAMIC_VERTEX_INPUT_BINDING_STRIDE)) {
for (uint32_t i = 0; i < MAX_VBS; i++)
d->vk.vi_binding_strides[i] = pipeline->dynamic_state.vk.vi_binding_strides[i];
}
/* When the vertex input state is static but the VS has been compiled without it (GPL), the /* When the vertex input state is static but the VS has been compiled without it (GPL), the
* driver needs to compile a VS prolog. * driver needs to compile a VS prolog.
*/ */
@ -8882,7 +8892,6 @@ radv_CmdSetVertexInputEXT(VkCommandBuffer commandBuffer, uint32_t vertexBindingD
const struct radv_physical_device *pdev = radv_device_physical(device); const struct radv_physical_device *pdev = radv_device_physical(device);
struct radv_cmd_state *state = &cmd_buffer->state; struct radv_cmd_state *state = &cmd_buffer->state;
struct radv_vertex_input_state *vi_state = &state->vertex_input; struct radv_vertex_input_state *vi_state = &state->vertex_input;
struct radv_dynamic_state *d = &cmd_buffer->state.dynamic;
const VkVertexInputBindingDescription2EXT *bindings[MAX_VBS]; const VkVertexInputBindingDescription2EXT *bindings[MAX_VBS];
for (unsigned i = 0; i < vertexBindingDescriptionCount; i++) for (unsigned i = 0; i < vertexBindingDescriptionCount; i++)
@ -8924,7 +8933,8 @@ radv_CmdSetVertexInputEXT(VkCommandBuffer commandBuffer, uint32_t vertexBindingD
vi_state->nontrivial_divisors |= 1u << loc; vi_state->nontrivial_divisors |= 1u << loc;
} }
} }
d->vk.vi_binding_strides[attrib->binding] = binding->stride;
radv_cmd_set_vertex_binding_strides(cmd_buffer, attrib->binding, 1, (uint16_t *)&binding->stride);
vi_state->offsets[loc] = attrib->offset; vi_state->offsets[loc] = attrib->offset;
enum pipe_format format = vk_format_map[attrib->format]; enum pipe_format format = vk_format_map[attrib->format];