X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=e4830ec22aee2340aae79a93711600f415ef89a6;hb=ee6bbd30f8b4c7e9d73124272cc0eec03093ddec;hp=fe2d56b8a4737bba58f6086a070ecc3da281b691;hpb=89f26eba675defb38542faacacde6b9d4a2248c5;p=libs%2Fgl.git diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp index fe2d56b8..e4830ec2 100644 --- a/source/glsl/generate.cpp +++ b/source/glsl/generate.cpp @@ -203,7 +203,7 @@ void InterfaceGenerator::visit(VariableReference &var) } for(const auto &kvp: stage->previous->interface_blocks) - if(kvp.first.find(' ')!=string::npos) + if(kvp.second->name.find(' ')!=string::npos) { const map &iface_vars = kvp.second->block_declaration->members.variables; i = iface_vars.find(var.name); @@ -350,7 +350,7 @@ void ArraySizer::apply(Stage &stage) size = input_size; else if(kvp.second>=0) size = kvp.second+1; - else if(!kvp.first->name.compare(0, 3, "gl_")) + if(!size && !kvp.first->name.compare(0, 3, "gl_")) size = 1; if(size>0)