mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

v3dv: PrimitiveRestartEnable is now dynamic. 

Since VK_EXT_extended_dynamic_state2

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28980>
This commit is contained in:
Alejandro Piñeiro 2024-04-26 23:52:40 +02:00 committed by Marge Bot
parent ebbb824240
commit 8ab0c55a53
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/broadcom/vulkan/v3dv_pipeline.c
View File

@ -2987,9 +2987,6 @@ pipeline_init(struct v3dv_pipeline *pipeline,
pipeline_set_sample_rate_shading(pipeline, ms_info);
pipeline->line_smooth = enable_line_smooth(pipeline->topology, rs_info);
pipeline->primitive_restart =
pCreateInfo->pInputAssemblyState->primitiveRestartEnable;
result = pipeline_compile_graphics(pipeline, cache, pCreateInfo, pAllocator);
if (result != VK_SUCCESS) {

1
src/broadcom/vulkan/v3dv_private.h
View File

@ -2286,7 +2286,6 @@ struct v3dv_pipeline {
bool sample_rate_shading;
uint32_t sample_mask;
bool primitive_restart;
bool negative_one_to_one;
/* Accessed by binding. So vb[binding]->stride is the stride of the vertex

8
src/broadcom/vulkan/v3dvx_cmd_buffer.c
View File

@ -2711,7 +2711,6 @@ v3dX(cmd_buffer_emit_draw_indexed)(struct v3dv_cmd_buffer *cmd_buffer,
struct v3dv_job *job = cmd_buffer->state.job;
assert(job);
const struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
const struct vk_dynamic_graphics_state *dyn =
&cmd_buffer->vk.dynamic_graphics_state;
uint32_t hw_prim_type = v3dv_pipeline_primitive(dyn->ia.primitive_topology);
@ -2739,7 +2738,7 @@ v3dX(cmd_buffer_emit_draw_indexed)(struct v3dv_cmd_buffer *cmd_buffer,
prim.length = indexCount;
prim.index_offset = index_offset;
prim.mode = hw_prim_type;
prim.enable_primitive_restarts = pipeline->primitive_restart;
prim.enable_primitive_restarts = dyn->ia.primitive_restart_enable;
}
} else if (instanceCount > 1) {
v3dv_cl_ensure_space_with_branch(
@ -2750,7 +2749,7 @@ v3dX(cmd_buffer_emit_draw_indexed)(struct v3dv_cmd_buffer *cmd_buffer,
prim.index_type = index_type;
prim.index_offset = index_offset;
prim.mode = hw_prim_type;
prim.enable_primitive_restarts = pipeline->primitive_restart;
prim.enable_primitive_restarts = dyn->ia.primitive_restart_enable;
prim.number_of_instances = instanceCount;
prim.instance_length = indexCount;
}
@ -2794,7 +2793,6 @@ v3dX(cmd_buffer_emit_indexed_indirect)(struct v3dv_cmd_buffer *cmd_buffer,
struct v3dv_job *job = cmd_buffer->state.job;
assert(job);
const struct v3dv_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
const struct vk_dynamic_graphics_state *dyn =
&cmd_buffer->vk.dynamic_graphics_state;
uint32_t hw_prim_type = v3dv_pipeline_primitive(dyn->ia.primitive_topology);
@ -2807,7 +2805,7 @@ v3dX(cmd_buffer_emit_indexed_indirect)(struct v3dv_cmd_buffer *cmd_buffer,
cl_emit(&job->bcl, INDIRECT_INDEXED_INSTANCED_PRIM_LIST, prim) {
prim.index_type = index_type;
prim.mode = hw_prim_type;
prim.enable_primitive_restarts = pipeline->primitive_restart;
prim.enable_primitive_restarts = dyn->ia.primitive_restart_enable;
prim.number_of_draw_indirect_indexed_records = drawCount;
prim.stride_in_multiples_of_4_bytes = stride >> 2;
prim.address = v3dv_cl_address(buffer->mem->bo,