[lunarglass] r1101 committed - Tests: Updated results, per previous check in.

[lunar...@googlecode.com]

Revision: 1101
Author: jo...@lunarg.com
Date: Tue Aug 4 03:12:04 2015 UTC
Log: Tests: Updated results, per previous check in.
https://code.google.com/p/lunarglass/source/detail?r=1101

Modified:
/trunk/test/baseResults/430.vert.out

=======================================
--- /trunk/test/baseResults/430.vert.out Thu May 21 01:11:19 2015 UTC
+++ /trunk/test/baseResults/430.vert.out Tue Aug 4 03:12:04 2015 UTC
@@ -54,8 +54,8 @@
!gla.entrypoint = !{!0}
!gla.outputs = !{!1, !7, !9}
!gla.inputs = !{!11, !13, !15, !17}
-!gla.uniforms = !{!19, !20, !21, !26, !29, !32, !35}
-!gla.noStaticUse = !{!20, !13, !9, !21, !26, !29, !32, !35, !15, !17}
+!gla.uniforms = !{!19, !20, !22, !27, !30, !33, !36}
+!gla.noStaticUse = !{!20, !13, !9, !22, !27, !30, !33, !36, !15, !17}
!gla.invariant = !{!9}

!0 = metadata !{metadata !"main", i32 15}
@@ -78,24 +78,25 @@
!17 = metadata !{metadata !"gl_InstanceID", i32 3, i32*
@gl_InstanceID_typeProxy, metadata !18}
!18 = metadata !{i32 0, i32 0, i32 1050, null, i32 0, i32 8}
!19 = metadata !{metadata !"f", i32 12, float* @f_typeProxy, metadata !4}
-!20 = metadata !{metadata !"uv4", i32 12, <4 x float>* @uv4_typeProxy,
metadata !4}
-!21 = metadata !{metadata !"boundInst", i32 13, %boundblock*
@boundInst_typeProxy, metadata !22, metadata !23}
-!22 = metadata !{i32 6, i32 0, i32 3, null}
-!23 = metadata !{metadata !"boundblock", metadata !24, metadata !"aoeu",
metadata !25}
-!24 = metadata !{i32 6, i32 0, i32 1024, null}
-!25 = metadata !{metadata !"", metadata !4}
-!26 = metadata !{metadata !"", i32 13, %anonblock* @"anon@1_typeProxy",
metadata !27, metadata !28}
-!27 = metadata !{i32 6, i32 0, i32 7, null}
-!28 = metadata !{metadata !"anonblock", metadata !24, metadata !"aoeu",
metadata !25}
-!29 = metadata !{metadata !"sampb1", i32 12, i32* @sampb1_typeProxy,
metadata !30}
-!30 = metadata !{i32 5, i32 0, i32 4, metadata !31}
-!31 = metadata !{i32 0, i32* @sampb1_typeProxy, i32 1, i1 false, i1 false,
i32 0}
-!32 = metadata !{metadata !"sampb2", i32 12, [10 x i32]*
@sampb2_typeProxy, metadata !33}
-!33 = metadata !{i32 5, i32 0, i32 5, metadata !34}
-!34 = metadata !{i32 0, [10 x i32]* @sampb2_typeProxy, i32 1, i1 false, i1
false, i32 0}
-!35 = metadata !{metadata !"sampb4", i32 12, i32* @sampb4_typeProxy,
metadata !36}
-!36 = metadata !{i32 5, i32 0, i32 31, metadata !37}
-!37 = metadata !{i32 0, i32* @sampb4_typeProxy, i32 1, i1 false, i1 false,
i32 0}
+!20 = metadata !{metadata !"uv4", i32 12, <4 x float>* @uv4_typeProxy,
metadata !21}
+!21 = metadata !{i32 0, i32 0, i32 4, null}
+!22 = metadata !{metadata !"boundInst", i32 13, %boundblock*
@boundInst_typeProxy, metadata !23, metadata !24}
+!23 = metadata !{i32 6, i32 0, i32 3, null}
+!24 = metadata !{metadata !"boundblock", metadata !25, metadata !"aoeu",
metadata !26}
+!25 = metadata !{i32 6, i32 0, i32 1024, null}
+!26 = metadata !{metadata !"", metadata !4}
+!27 = metadata !{metadata !"", i32 13, %anonblock* @"anon@1_typeProxy",
metadata !28, metadata !29}
+!28 = metadata !{i32 6, i32 0, i32 7, null}
+!29 = metadata !{metadata !"anonblock", metadata !25, metadata !"aoeu",
metadata !26}
+!30 = metadata !{metadata !"sampb1", i32 12, i32* @sampb1_typeProxy,
metadata !31}
+!31 = metadata !{i32 5, i32 0, i32 4, metadata !32}
+!32 = metadata !{i32 0, i32* @sampb1_typeProxy, i32 1, i1 false, i1 false,
i32 0}
+!33 = metadata !{metadata !"sampb2", i32 12, [10 x i32]*
@sampb2_typeProxy, metadata !34}
+!34 = metadata !{i32 5, i32 0, i32 5, metadata !35}
+!35 = metadata !{i32 0, [10 x i32]* @sampb2_typeProxy, i32 1, i1 false, i1
false, i32 0}
+!36 = metadata !{metadata !"sampb4", i32 12, i32* @sampb4_typeProxy,
metadata !37}
+!37 = metadata !{i32 5, i32 0, i32 31, metadata !38}
+!38 = metadata !{i32 0, i32* @sampb4_typeProxy, i32 1, i1 false, i1 false,
i32 0}


Bottom IR:
@@ -142,8 +143,8 @@
!gla.entrypoint = !{!0}
!gla.outputs = !{!1, !7, !9}
!gla.inputs = !{!11, !13, !15, !17}
-!gla.uniforms = !{!19, !20, !21, !26, !29, !32, !35}
-!gla.noStaticUse = !{!20, !13, !9, !21, !26, !29, !32, !35, !15, !17}
+!gla.uniforms = !{!19, !20, !22, !27, !30, !33, !36}
+!gla.noStaticUse = !{!20, !13, !9, !22, !27, !30, !33, !36, !15, !17}
!gla.invariant = !{!9}

!0 = metadata !{metadata !"main", i32 15}
@@ -166,28 +167,29 @@
!17 = metadata !{metadata !"gl_InstanceID", i32 3, i32*
@gl_InstanceID_typeProxy, metadata !18}
!18 = metadata !{i32 0, i32 0, i32 1050, null, i32 0, i32 8}
!19 = metadata !{metadata !"f", i32 12, float* @f_typeProxy, metadata !4}
-!20 = metadata !{metadata !"uv4", i32 12, <4 x float>* @uv4_typeProxy,
metadata !4}
-!21 = metadata !{metadata !"boundInst", i32 13, %boundblock*
@boundInst_typeProxy, metadata !22, metadata !23}
-!22 = metadata !{i32 6, i32 0, i32 3, null}
-!23 = metadata !{metadata !"boundblock", metadata !24, metadata !"aoeu",
metadata !25}
-!24 = metadata !{i32 6, i32 0, i32 1024, null}
-!25 = metadata !{metadata !"", metadata !4}
-!26 = metadata !{metadata !"", i32 13, %anonblock* @"anon@1_typeProxy",
metadata !27, metadata !28}
-!27 = metadata !{i32 6, i32 0, i32 7, null}
-!28 = metadata !{metadata !"anonblock", metadata !24, metadata !"aoeu",
metadata !25}
-!29 = metadata !{metadata !"sampb1", i32 12, i32* @sampb1_typeProxy,
metadata !30}
-!30 = metadata !{i32 5, i32 0, i32 4, metadata !31}
-!31 = metadata !{i32 0, i32* @sampb1_typeProxy, i32 1, i1 false, i1 false,
i32 0}
-!32 = metadata !{metadata !"sampb2", i32 12, [10 x i32]*
@sampb2_typeProxy, metadata !33}
-!33 = metadata !{i32 5, i32 0, i32 5, metadata !34}
-!34 = metadata !{i32 0, [10 x i32]* @sampb2_typeProxy, i32 1, i1 false, i1
false, i32 0}
-!35 = metadata !{metadata !"sampb4", i32 12, i32* @sampb4_typeProxy,
metadata !36}
-!36 = metadata !{i32 5, i32 0, i32 31, metadata !37}
-!37 = metadata !{i32 0, i32* @sampb4_typeProxy, i32 1, i1 false, i1 false,
i32 0}
+!20 = metadata !{metadata !"uv4", i32 12, <4 x float>* @uv4_typeProxy,
metadata !21}
+!21 = metadata !{i32 0, i32 0, i32 4, null}
+!22 = metadata !{metadata !"boundInst", i32 13, %boundblock*
@boundInst_typeProxy, metadata !23, metadata !24}
+!23 = metadata !{i32 6, i32 0, i32 3, null}
+!24 = metadata !{metadata !"boundblock", metadata !25, metadata !"aoeu",
metadata !26}
+!25 = metadata !{i32 6, i32 0, i32 1024, null}
+!26 = metadata !{metadata !"", metadata !4}
+!27 = metadata !{metadata !"", i32 13, %anonblock* @"anon@1_typeProxy",
metadata !28, metadata !29}
+!28 = metadata !{i32 6, i32 0, i32 7, null}
+!29 = metadata !{metadata !"anonblock", metadata !25, metadata !"aoeu",
metadata !26}
+!30 = metadata !{metadata !"sampb1", i32 12, i32* @sampb1_typeProxy,
metadata !31}
+!31 = metadata !{i32 5, i32 0, i32 4, metadata !32}
+!32 = metadata !{i32 0, i32* @sampb1_typeProxy, i32 1, i1 false, i1 false,
i32 0}
+!33 = metadata !{metadata !"sampb2", i32 12, [10 x i32]*
@sampb2_typeProxy, metadata !34}
+!34 = metadata !{i32 5, i32 0, i32 5, metadata !35}
+!35 = metadata !{i32 0, [10 x i32]* @sampb2_typeProxy, i32 1, i1 false, i1
false, i32 0}
+!36 = metadata !{metadata !"sampb4", i32 12, i32* @sampb4_typeProxy,
metadata !37}
+!37 = metadata !{i32 5, i32 0, i32 31, metadata !38}
+!38 = metadata !{i32 0, i32* @sampb4_typeProxy, i32 1, i1 false, i1 false,
i32 0}
#version 430 core
// LunarGOO output
uniform float f;
-uniform vec4 uv4;
+layout(location=4) uniform vec4 uv4;
uniform boundblock {
int aoeu;
} boundInst;
@@ -222,7 +224,7 @@
#version 430 core
// LunarGOO output
uniform float f;
-uniform vec4 uv4;
+layout(location=4) uniform vec4 uv4;
uniform boundblock {
int aoeu;
} boundInst;