This should complete the GLXPixmap commits for now. (cherry picked from commit 7e99b55651)
7e99b55651