X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=947b310ef5e528e026dd53dcbd642de96f4923b3;hp=b224763248f26aa20f2d7e537ccbc6aa224acdb7;hb=c701c8787cb19fbb6dc5b0bfae1a94e2b07dd549;hpb=6377f8efc81ffe84b7ffe44380f1caa2059f437f diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp index b2247632..947b310e 100644 --- a/source/glsl/syntax.cpp +++ b/source/glsl/syntax.cpp @@ -487,66 +487,6 @@ string get_unused_variable_name(const Block &block, const string &base) } } -bool is_same_type(const TypeDeclaration &type1, const TypeDeclaration &type2) -{ - if(const BasicTypeDeclaration *basic1 = dynamic_cast(&type1)) - { - const BasicTypeDeclaration *basic2 = dynamic_cast(&type2); - if(!basic2) - return false; - - if(basic1->kind!=basic2->kind || basic1->size!=basic2->size) - return false; - - if(basic1->base_type && basic2->base_type) - return is_same_type(*basic1->base_type, *basic2->base_type); - else - return (!basic1->base_type && !basic2->base_type); - } - else if(const ImageTypeDeclaration *image1 = dynamic_cast(&type1)) - { - const ImageTypeDeclaration *image2 = dynamic_cast(&type2); - if(!image2) - return false; - - if(image1->dimensions!=image2->dimensions || image1->array!=image2->array) - return false; - if(image1->sampled!=image2->sampled || image1->shadow!=image2->shadow) - return false; - - if(image1->base_type && image2->base_type) - return is_same_type(*image1->base_type, *image2->base_type); - else - return (!image1->base_type && !image2->base_type); - } - else if(const StructDeclaration *strct1 = dynamic_cast(&type1)) - { - const StructDeclaration *strct2 = dynamic_cast(&type2); - if(!strct2) - return false; - - NodeList::const_iterator i = strct1->members.body.begin(); - NodeList::const_iterator j = strct2->members.body.begin(); - for(; (i!=strct1->members.body.end() && j!=strct2->members.body.end()); ++i, ++j) - { - const VariableDeclaration *var1 = dynamic_cast(i->get()); - const VariableDeclaration *var2 = dynamic_cast(j->get()); - if(!var1 || !var1->type_declaration || !var2 || !var2->type_declaration) - return false; - if(!is_same_type(*var1->type_declaration, *var2->type_declaration)) - return false; - if(var1->name!=var2->name || var1->array!=var2->array) - return false; - // TODO Compare array sizes - // TODO Compare layout qualifiers for interface block members - } - - return (i==strct1->members.body.end() && j==strct2->members.body.end()); - } - else - return false; -} - int get_layout_value(const Layout &layout, const string &name, int def_value) { for(vector::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i)