Continuing to merge the OpenGL transform changes.  This commit does not build.  It is only being used a fallback point.