merged shader_setup into draw_shaders
Merge branch 'master' into remove_shader_setup