Sorry, but there have been so much changes in this file. It's hard to backport these and it would be very error-prone trying to do that. At least it's already fixed in Mesa 24.2.x (in preparation for Tumbleweed, sle15-sp7, Leap 16).