X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fglsl%2Fcompiler.cpp;h=e6c035775a89b0ff1aaa98464755d031a73fed98;hb=7a16308e72aef363727b21348779673edf8e5c07;hp=031ae265f52b514c93384d173218d9b400644fb9;hpb=696a97bd7411d69953c1a9e4b5f3dfb4c1d848f1;p=libs%2Fgl.git diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp index 031ae265..e6c03577 100644 --- a/source/glsl/compiler.cpp +++ b/source/glsl/compiler.cpp @@ -65,15 +65,15 @@ void Compiler::add_shaders(Program &program) { for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) { - if(i->type==VERTEX) + if(i->type==Stage::VERTEX) { program.attach_shader_owned(new VertexShader(apply(*i))); for(map::iterator j=i->locations.begin(); j!=i->locations.end(); ++j) program.bind_attribute(j->second, j->first); } - else if(i->type==GEOMETRY) + else if(i->type==Stage::GEOMETRY) program.attach_shader_owned(new GeometryShader(apply(*i))); - else if(i->type==FRAGMENT) + else if(i->type==Stage::FRAGMENT) { program.attach_shader_owned(new FragmentShader(apply(*i))); if(EXT_gpu_shader4) @@ -137,7 +137,7 @@ void Compiler::append_module(Module &mod) void Compiler::append_stage(Stage &stage) { Stage *target = 0; - if(stage.type==SHARED) + if(stage.type==Stage::SHARED) target = &module->shared; else {