Merge pull request #1670 from rextimmy/dx9_generic_shaders