(XDK1) Build fix
(XDK1) Cleanup xdk_set_shader
(XDK D3D) Take out another HAVE_HLSL ifdef
Merge remote-tracking branch 'upstream/master'