Fix two multi-sample bugs: 1) include MS in name mangling, 2) add 'sample' argument texelFetch(*MS*,...).

This commit is contained in:
John Kessenich
2015-08-16 21:04:07 -06:00
parent dc9eff7221
commit 2b0a11351f
10 changed files with 74 additions and 71 deletions

View File

@@ -211,16 +211,16 @@ ERROR: node is still EOpNull!
0:? Sequence
0:63 move second child to first child (temp highp 2-component vector of int)
0:63 'v2' (temp highp 2-component vector of int)
0:63 Function Call: textureSize(s21; (global highp 2-component vector of int)
0:63 Function Call: textureSize(s2M1; (global highp 2-component vector of int)
0:63 's2dms' (uniform highp sampler2DMS)
0:64 move second child to first child (temp highp 2-component vector of int)
0:64 'v2' (temp highp 2-component vector of int)
0:64 Function Call: textureSize(us21; (global highp 2-component vector of int)
0:64 Function Call: textureSize(us2M1; (global highp 2-component vector of int)
0:64 'us2dms' (uniform highp usampler2DMS)
0:65 Sequence
0:65 move second child to first child (temp highp 4-component vector of float)
0:65 'v4' (temp highp 4-component vector of float)
0:65 Function Call: texelFetch(s21;vi2;i1; (global highp 4-component vector of float)
0:65 Function Call: texelFetch(s2M1;vi2;i1; (global highp 4-component vector of float)
0:65 's2dms' (uniform highp sampler2DMS)
0:65 'v2' (temp highp 2-component vector of int)
0:65 Constant:
@@ -228,7 +228,7 @@ ERROR: node is still EOpNull!
0:66 Sequence
0:66 move second child to first child (temp highp 4-component vector of int)
0:66 'iv4' (temp highp 4-component vector of int)
0:66 Function Call: texelFetch(is21;vi2;i1; (global highp 4-component vector of int)
0:66 Function Call: texelFetch(is2M1;vi2;i1; (global highp 4-component vector of int)
0:66 'is2dms' (uniform highp isampler2DMS)
0:66 'v2' (temp highp 2-component vector of int)
0:66 Constant:
@@ -937,16 +937,16 @@ ERROR: node is still EOpNull!
0:? Sequence
0:63 move second child to first child (temp highp 2-component vector of int)
0:63 'v2' (temp highp 2-component vector of int)
0:63 Function Call: textureSize(s21; (global highp 2-component vector of int)
0:63 Function Call: textureSize(s2M1; (global highp 2-component vector of int)
0:63 's2dms' (uniform highp sampler2DMS)
0:64 move second child to first child (temp highp 2-component vector of int)
0:64 'v2' (temp highp 2-component vector of int)
0:64 Function Call: textureSize(us21; (global highp 2-component vector of int)
0:64 Function Call: textureSize(us2M1; (global highp 2-component vector of int)
0:64 'us2dms' (uniform highp usampler2DMS)
0:65 Sequence
0:65 move second child to first child (temp highp 4-component vector of float)
0:65 'v4' (temp highp 4-component vector of float)
0:65 Function Call: texelFetch(s21;vi2;i1; (global highp 4-component vector of float)
0:65 Function Call: texelFetch(s2M1;vi2;i1; (global highp 4-component vector of float)
0:65 's2dms' (uniform highp sampler2DMS)
0:65 'v2' (temp highp 2-component vector of int)
0:65 Constant:
@@ -954,7 +954,7 @@ ERROR: node is still EOpNull!
0:66 Sequence
0:66 move second child to first child (temp highp 4-component vector of int)
0:66 'iv4' (temp highp 4-component vector of int)
0:66 Function Call: texelFetch(is21;vi2;i1; (global highp 4-component vector of int)
0:66 Function Call: texelFetch(is2M1;vi2;i1; (global highp 4-component vector of int)
0:66 'is2dms' (uniform highp isampler2DMS)
0:66 'v2' (temp highp 2-component vector of int)
0:66 Constant: