X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.cpp;h=baeba9f5c33d1091da815f0d14d7f6be45807b3b;hb=49758ab622d2e8ed4b3a60d7b9afc4abd741300c;hp=c8ce67a8897fc6fd5499b251e4a7713b71ff496e;hpb=6924ea10c4111b11eab51f0e1aa5b4a6438da7d3;p=libs%2Fgl.git diff --git a/source/program.cpp b/source/program.cpp index c8ce67a8..baeba9f5 100644 --- a/source/program.cpp +++ b/source/program.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "buffer.h" #include "error.h" @@ -28,8 +29,7 @@ Program::Program(const ProgramBuilder::StandardFeatures &features) ProgramBuilder builder(features); builder.add_shaders(*this); - if(!features.transform) - link(); + link(); } Program::Program(const string &vert, const string &frag) @@ -88,6 +88,17 @@ void Program::bind_attribute(unsigned index, const string &name) glBindAttribLocation(id, index, name.c_str()); } +void Program::bind_attribute(VertexComponent comp, const string &name) +{ + bind_attribute(get_component_type(comp), name); +} + +void Program::bind_fragment_data(unsigned index, const string &name) +{ + static Require _req(EXT_gpu_shader4); + glBindFragDataLocation(id, index, name.c_str()); +} + void Program::link() { for(ShaderList::iterator i=shaders.begin(); i!=shaders.end(); ++i)