Revert sample back to defaults (was forcing EGL)
Added skeleton support for GPU switching on MacOS X