DirectX 11 basic rendering
Conflicts resolved