X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=demos%2Fshaders.cpp;h=73ae1b721321696ddc3114bfbb97676df16e00bd;hb=9034e81679eeeaa3d1d5d643d3f924d9edb45a68;hp=27538e4eb2e6a2c35e1bf5aa9e7fa4465a5b8bd8;hpb=0c731643d6363eb4c492e836ffb919cb7c0a3035;p=libs%2Fgl.git diff --git a/demos/shaders.cpp b/demos/shaders.cpp index 27538e4e..73ae1b72 100644 --- a/demos/shaders.cpp +++ b/demos/shaders.cpp @@ -67,7 +67,7 @@ int main() vector programs; for(unsigned i=0; i<12; ++i) { - GL::Program::StandardFeatures feat; + GL::ProgramBuilder::StandardFeatures feat; feat.material = i/4>0; feat.texture = i/4>1; feat.lighting = i%4>0; @@ -83,6 +83,7 @@ int main() } GL::ProgramData progdata; + progdata.uniform("texture", 0); progdata.uniform("normalmap", 1); GL::Lighting lighting;