
        Fix merge errors from the refactor-gfx merge.

076a43b