HLSL: phase 3b: Texture methods remember and return vector size.

Also makes a (correct) test change for global -> temp vars.
This commit is contained in:
steve-lunarg
2016-10-14 16:40:32 -06:00
parent 4f2da27aec
commit 8b0227ced9
27 changed files with 800 additions and 541 deletions

View File

@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:31 Sequence
0:31 move second child to first child (temp 4-component vector of float)
0:31 'txval10' (temp 4-component vector of float)
0:31 texture (global 4-component vector of float)
0:31 texture (temp 4-component vector of float)
0:31 Construct combined texture-sampler (temp sampler1D)
0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:31 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -19,7 +19,7 @@ gl_FragCoord origin is upper left
0:32 Sequence
0:32 move second child to first child (temp 4-component vector of int)
0:32 'txval11' (temp 4-component vector of int)
0:32 texture (global 4-component vector of int)
0:32 texture (temp 4-component vector of int)
0:32 Construct combined texture-sampler (temp isampler1D)
0:32 'g_tTex1di4' (uniform itexture1D)
0:32 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -30,7 +30,7 @@ gl_FragCoord origin is upper left
0:33 Sequence
0:33 move second child to first child (temp 4-component vector of uint)
0:33 'txval12' (temp 4-component vector of uint)
0:33 texture (global 4-component vector of uint)
0:33 texture (temp 4-component vector of uint)
0:33 Construct combined texture-sampler (temp usampler1D)
0:33 'g_tTex1du4' (uniform utexture1D)
0:33 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -41,7 +41,7 @@ gl_FragCoord origin is upper left
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of float)
0:35 'txval20' (temp 4-component vector of float)
0:35 texture (global 4-component vector of float)
0:35 texture (temp 4-component vector of float)
0:35 Construct combined texture-sampler (temp sampler2D)
0:35 'g_tTex2df4' (uniform texture2D)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -53,7 +53,7 @@ gl_FragCoord origin is upper left
0:36 Sequence
0:36 move second child to first child (temp 4-component vector of int)
0:36 'txval21' (temp 4-component vector of int)
0:36 texture (global 4-component vector of int)
0:36 texture (temp 4-component vector of int)
0:36 Construct combined texture-sampler (temp isampler2D)
0:36 'g_tTex2di4' (uniform itexture2D)
0:36 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -65,7 +65,7 @@ gl_FragCoord origin is upper left
0:37 Sequence
0:37 move second child to first child (temp 4-component vector of uint)
0:37 'txval22' (temp 4-component vector of uint)
0:37 texture (global 4-component vector of uint)
0:37 texture (temp 4-component vector of uint)
0:37 Construct combined texture-sampler (temp usampler2D)
0:37 'g_tTex2du4' (uniform utexture2D)
0:37 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -77,7 +77,7 @@ gl_FragCoord origin is upper left
0:39 Sequence
0:39 move second child to first child (temp 4-component vector of float)
0:39 'txval30' (temp 4-component vector of float)
0:39 texture (global 4-component vector of float)
0:39 texture (temp 4-component vector of float)
0:39 Construct combined texture-sampler (temp sampler3D)
0:39 'g_tTex3df4' (uniform texture3D)
0:39 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -90,7 +90,7 @@ gl_FragCoord origin is upper left
0:40 Sequence
0:40 move second child to first child (temp 4-component vector of int)
0:40 'txval31' (temp 4-component vector of int)
0:40 texture (global 4-component vector of int)
0:40 texture (temp 4-component vector of int)
0:40 Construct combined texture-sampler (temp isampler3D)
0:40 'g_tTex3di4' (uniform itexture3D)
0:40 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -103,7 +103,7 @@ gl_FragCoord origin is upper left
0:41 Sequence
0:41 move second child to first child (temp 4-component vector of uint)
0:41 'txval32' (temp 4-component vector of uint)
0:41 texture (global 4-component vector of uint)
0:41 texture (temp 4-component vector of uint)
0:41 Construct combined texture-sampler (temp usampler3D)
0:41 'g_tTex3du4' (uniform utexture3D)
0:41 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -116,7 +116,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp 4-component vector of float)
0:43 'txval40' (temp 4-component vector of float)
0:43 texture (global 4-component vector of float)
0:43 texture (temp 4-component vector of float)
0:43 Construct combined texture-sampler (temp samplerCube)
0:43 'g_tTexcdf4' (uniform textureCube)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -129,7 +129,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp 4-component vector of int)
0:44 'txval41' (temp 4-component vector of int)
0:44 texture (global 4-component vector of int)
0:44 texture (temp 4-component vector of int)
0:44 Construct combined texture-sampler (temp isamplerCube)
0:44 'g_tTexcdi4' (uniform itextureCube)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -142,7 +142,7 @@ gl_FragCoord origin is upper left
0:45 Sequence
0:45 move second child to first child (temp 4-component vector of uint)
0:45 'txval42' (temp 4-component vector of uint)
0:45 texture (global 4-component vector of uint)
0:45 texture (temp 4-component vector of uint)
0:45 Construct combined texture-sampler (temp usamplerCube)
0:45 'g_tTexcdu4' (uniform utextureCube)
0:45 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -215,7 +215,7 @@ gl_FragCoord origin is upper left
0:31 Sequence
0:31 move second child to first child (temp 4-component vector of float)
0:31 'txval10' (temp 4-component vector of float)
0:31 texture (global 4-component vector of float)
0:31 texture (temp 4-component vector of float)
0:31 Construct combined texture-sampler (temp sampler1D)
0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:31 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -226,7 +226,7 @@ gl_FragCoord origin is upper left
0:32 Sequence
0:32 move second child to first child (temp 4-component vector of int)
0:32 'txval11' (temp 4-component vector of int)
0:32 texture (global 4-component vector of int)
0:32 texture (temp 4-component vector of int)
0:32 Construct combined texture-sampler (temp isampler1D)
0:32 'g_tTex1di4' (uniform itexture1D)
0:32 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -237,7 +237,7 @@ gl_FragCoord origin is upper left
0:33 Sequence
0:33 move second child to first child (temp 4-component vector of uint)
0:33 'txval12' (temp 4-component vector of uint)
0:33 texture (global 4-component vector of uint)
0:33 texture (temp 4-component vector of uint)
0:33 Construct combined texture-sampler (temp usampler1D)
0:33 'g_tTex1du4' (uniform utexture1D)
0:33 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -248,7 +248,7 @@ gl_FragCoord origin is upper left
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of float)
0:35 'txval20' (temp 4-component vector of float)
0:35 texture (global 4-component vector of float)
0:35 texture (temp 4-component vector of float)
0:35 Construct combined texture-sampler (temp sampler2D)
0:35 'g_tTex2df4' (uniform texture2D)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -260,7 +260,7 @@ gl_FragCoord origin is upper left
0:36 Sequence
0:36 move second child to first child (temp 4-component vector of int)
0:36 'txval21' (temp 4-component vector of int)
0:36 texture (global 4-component vector of int)
0:36 texture (temp 4-component vector of int)
0:36 Construct combined texture-sampler (temp isampler2D)
0:36 'g_tTex2di4' (uniform itexture2D)
0:36 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -272,7 +272,7 @@ gl_FragCoord origin is upper left
0:37 Sequence
0:37 move second child to first child (temp 4-component vector of uint)
0:37 'txval22' (temp 4-component vector of uint)
0:37 texture (global 4-component vector of uint)
0:37 texture (temp 4-component vector of uint)
0:37 Construct combined texture-sampler (temp usampler2D)
0:37 'g_tTex2du4' (uniform utexture2D)
0:37 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -284,7 +284,7 @@ gl_FragCoord origin is upper left
0:39 Sequence
0:39 move second child to first child (temp 4-component vector of float)
0:39 'txval30' (temp 4-component vector of float)
0:39 texture (global 4-component vector of float)
0:39 texture (temp 4-component vector of float)
0:39 Construct combined texture-sampler (temp sampler3D)
0:39 'g_tTex3df4' (uniform texture3D)
0:39 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -297,7 +297,7 @@ gl_FragCoord origin is upper left
0:40 Sequence
0:40 move second child to first child (temp 4-component vector of int)
0:40 'txval31' (temp 4-component vector of int)
0:40 texture (global 4-component vector of int)
0:40 texture (temp 4-component vector of int)
0:40 Construct combined texture-sampler (temp isampler3D)
0:40 'g_tTex3di4' (uniform itexture3D)
0:40 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -310,7 +310,7 @@ gl_FragCoord origin is upper left
0:41 Sequence
0:41 move second child to first child (temp 4-component vector of uint)
0:41 'txval32' (temp 4-component vector of uint)
0:41 texture (global 4-component vector of uint)
0:41 texture (temp 4-component vector of uint)
0:41 Construct combined texture-sampler (temp usampler3D)
0:41 'g_tTex3du4' (uniform utexture3D)
0:41 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -323,7 +323,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp 4-component vector of float)
0:43 'txval40' (temp 4-component vector of float)
0:43 texture (global 4-component vector of float)
0:43 texture (temp 4-component vector of float)
0:43 Construct combined texture-sampler (temp samplerCube)
0:43 'g_tTexcdf4' (uniform textureCube)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -336,7 +336,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp 4-component vector of int)
0:44 'txval41' (temp 4-component vector of int)
0:44 texture (global 4-component vector of int)
0:44 texture (temp 4-component vector of int)
0:44 Construct combined texture-sampler (temp isamplerCube)
0:44 'g_tTexcdi4' (uniform itextureCube)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -349,7 +349,7 @@ gl_FragCoord origin is upper left
0:45 Sequence
0:45 move second child to first child (temp 4-component vector of uint)
0:45 'txval42' (temp 4-component vector of uint)
0:45 texture (global 4-component vector of uint)
0:45 texture (temp 4-component vector of uint)
0:45 Construct combined texture-sampler (temp usamplerCube)
0:45 'g_tTexcdu4' (uniform utextureCube)
0:45 'g_sSamp' (layout(binding=0 ) uniform sampler)