X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Freflect.cpp;h=21f12d0eb1c57b25491832651d9812aac0beb55b;hb=7d145421b050647a4599ac779e634ce2fa60d3ec;hp=32c7c7330d0577fde5c156f90d0e3b9925022518;hpb=66cf095b3eeb3f5a37cc16231680a18d67b292fb;p=libs%2Fgl.git

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 32c7c733..21f12d0e 100644
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -219,6 +219,8 @@ void TypeComparer::visit(VariableDeclaration &var)
 				r_result = false;
 				if(var1->array_size && var.array_size)
 					compare(*var1->array_size, *var.array_size);
+				else if(!var1->array_size && !var.array_size)
+					r_result = true;
 			}
 			if(r_result && var1->type_declaration!=var.type_declaration)
 				compare(*var1->type_declaration, *var.type_declaration);
@@ -284,6 +286,9 @@ void MemoryRequirementsCalculator::visit(BasicTypeDeclaration &basic)
 	}
 	else if(basic.kind==BasicTypeDeclaration::ARRAY)
 		basic.base_type->visit(*this);
+
+	if(basic.extended_alignment)
+		r_alignment = (r_alignment+15)&~15U;
 }
 
 void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
@@ -305,6 +310,8 @@ void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
 	}
 	r_size = total;
 	r_alignment = max_align;
+	if(strct.extended_alignment)
+		r_alignment = (r_alignment+15)&~15U;
 	r_size += r_alignment-1;
 	r_size -= r_size%r_alignment;
 }