(In reply to Bas Nieuwenhuizen from comment #4)
> Does the attached patch help? If not I would appreciate it if someone could
> find the first commit that fails (using e.g. bisect).

Checking out for example f91c85b29b8261ab3f44d292ed2130d4f577d976 and starting
Tomb Raider restarts the X server on my machine.