Entirely new system for building standard shaders

[libs/gl.git] / demos / shaders.cpp

diff --git a/demos/shaders.cpp b/demos/shaders.cpp
index 27538e4eb2e6a2c35e1bf5aa9e7fa4465a5b8bd8..73ae1b721321696ddc3114bfbb97676df16e00bd 100644 (file)
--- a/demos/shaders.cpp
+++ b/demos/shaders.cpp
@@ -67,7 +67,7 @@ int main()
        vector<GL::Program *> 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;