Merged and fixed latest changes.
- Fixed the D3D demo
- Use a single pixel shader file, with #define for EDGE_AA, as in the GL implementation
- Updated scissor extent to match GL.