fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 15:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: fix extending the dirty bits to 64-bit

Browse source 
New dynamic states added for VK_EXT_extended_dynamic_state2 causes
GPU hangs with vkd3d-proton.

Fixes: 7bdd569d7e ("radv: extend the dirty bits to 64-bit")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10693>
(cherry picked from commit 54b0cfb061)
This commit is contained in:
Samuel Pitoiset 2021-05-07 18:07:12 +02:00 • committed by Eric Engestrom
parent 92bb5b148c
commit b958323194
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -958,7 +958,7 @@
"description": "radv: fix extending the dirty bits to 64-bit",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "7bdd569d7e12143dc576d63606772b493a80f257"
},

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

@ -1416,7 +1416,7 @@ radv_emit_line_stipple(struct radv_cmd_buffer *cmd_buffer)
}
static void
radv_emit_culling(struct radv_cmd_buffer *cmd_buffer, uint32_t states)
radv_emit_culling(struct radv_cmd_buffer *cmd_buffer, uint64_t states)
{
unsigned pa_su_sc_mode_cntl = cmd_buffer->state.pipeline->graphics.pa_su_sc_mode_cntl;
struct radv_dynamic_state *d = &cmd_buffer->state.dynamic;
@ -1451,7 +1451,7 @@ radv_emit_primitive_topology(struct radv_cmd_buffer *cmd_buffer)
}
static void
radv_emit_depth_control(struct radv_cmd_buffer *cmd_buffer, uint32_t states)
radv_emit_depth_control(struct radv_cmd_buffer *cmd_buffer, uint64_t states)
{
unsigned db_depth_control = cmd_buffer->state.pipeline->graphics.db_depth_control;
struct radv_dynamic_state *d = &cmd_buffer->state.dynamic;
@ -2509,7 +2509,7 @@ radv_set_db_count_control(struct radv_cmd_buffer *cmd_buffer)
static void
radv_cmd_buffer_flush_dynamic_state(struct radv_cmd_buffer *cmd_buffer)
{
uint32_t states =
uint64_t states =
cmd_buffer->state.dirty & cmd_buffer->state.emitted_pipeline->graphics.needed_dynamic_state;
if (states & (RADV_CMD_DIRTY_DYNAMIC_VIEWPORT))

2
src/amd/vulkan/radv_private.h
View file

@ -1704,7 +1704,7 @@ struct radv_pipeline {
bool uses_drawid;
bool uses_baseinstance;
bool can_use_guardband;
uint32_t needed_dynamic_state;
uint64_t needed_dynamic_state;
bool disable_out_of_order_rast_for_occlusion;
unsigned tess_patch_control_points;
unsigned pa_su_sc_mode_cntl;