X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.cpp;h=01644c02400d739b82f737a4e90aee8c886b3189;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=75f982d7f5dc8fa4c2235af999249cd23cae4146;hpb=56c9bfa0b47583fb9067705a69c3639a17d4a097;p=libs%2Fgl.git diff --git a/source/program.cpp b/source/program.cpp index 75f982d7..01644c02 100644 --- a/source/program.cpp +++ b/source/program.cpp @@ -141,9 +141,9 @@ const Program *Program::cur_prog=0; Program::Loader::Loader(Program &p): - prog(p) + DataFile::ObjectLoader(p) { - prog.set_del_shaders(true); + obj.set_del_shaders(true); add("vertex_shader", &Loader::vertex_shader); add("fragment_shader", &Loader::fragment_shader); @@ -152,22 +152,22 @@ Program::Loader::Loader(Program &p): void Program::Loader::vertex_shader(const string &src) { - prog.attach_shader(*new Shader(VERTEX_SHADER, src)); + obj.attach_shader(*new Shader(VERTEX_SHADER, src)); } void Program::Loader::fragment_shader(const string &src) { - prog.attach_shader(*new Shader(FRAGMENT_SHADER, src)); + obj.attach_shader(*new Shader(FRAGMENT_SHADER, src)); } void Program::Loader::attribute(uint i, const string &n) { - prog.bind_attribute(i, n); + obj.bind_attribute(i, n); } void Program::Loader::finish() { - prog.link(); + obj.link(); } } // namespace GL