Skip to content

Revert st/dri FLUSH_VERTICES call

Daniel Stone requested to merge daniels/mesa:revert-st-dri-flush-vertices into master

These commits from !3044 (closed) break (at least) QuakeSpasm on Panfrost, getting into an infinite recursion of:

#7028 0xa594de94 in vbo_exec_vtx_flush () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7029 0xa594a7c4 in vbo_exec_FlushVertices_internal () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7030 0xa594c25c in vbo_exec_FlushVertices () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7031 0xa564de74 in st_context_flush_resource () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7032 0xa55adf6c in dri2_allocate_textures () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7033 0xa55b3424 in dri_st_framebuffer_validate () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7034 0xa564cde8 in st_framebuffer_validate () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7035 0xa564eff4 in st_manager_validate_framebuffers () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7036 0xa5684494 in st_validate_state () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7037 0xa566eac8 in prepare_draw () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7038 0xa566ec78 in st_draw_vbo () from /tmp/panfrost/lib/dri/rockchip_dri.so
#7039 0xa594de94 in vbo_exec_vtx_flush () from /tmp/panfrost/lib/dri/rockchip_dri.so

This doesn't enter into Panfrost code, so it's not sure why it would be recursing like this if the core code is correct.

Reverting these two commits to unbreak Panfrost until we figure out how to fix them.

/cc @mareko @icecream95 @flacks

Merge request reports