mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

48
Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out
View File

@@ -7,7 +7,7 @@ Shader version: 450
0:30 Sequence
0:30 move second child to first child (temp 4-component vector of float)
0:30 'txval10' (temp 4-component vector of float)
0:30 textureGrad (global 4-component vector of float)
0:30 textureGrad (temp 4-component vector of float)
0:30 Construct combined texture-sampler (temp sampler1D)
0:30 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:30 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -20,7 +20,7 @@ Shader version: 450
0:31 Sequence
0:31 move second child to first child (temp 4-component vector of int)
0:31 'txval11' (temp 4-component vector of int)
0:31 textureGrad (global 4-component vector of int)
0:31 textureGrad (temp 4-component vector of int)
0:31 Construct combined texture-sampler (temp isampler1D)
0:31 'g_tTex1di4' (uniform itexture1D)
0:31 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -33,7 +33,7 @@ Shader version: 450
0:32 Sequence
0:32 move second child to first child (temp 4-component vector of uint)
0:32 'txval12' (temp 4-component vector of uint)
0:32 textureGrad (global 4-component vector of uint)
0:32 textureGrad (temp 4-component vector of uint)
0:32 Construct combined texture-sampler (temp usampler1D)
0:32 'g_tTex1du4' (uniform utexture1D)
0:32 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -46,7 +46,7 @@ Shader version: 450
0:34 Sequence
0:34 move second child to first child (temp 4-component vector of float)
0:34 'txval20' (temp 4-component vector of float)
0:34 textureGrad (global 4-component vector of float)
0:34 textureGrad (temp 4-component vector of float)
0:34 Construct combined texture-sampler (temp sampler2D)
0:34 'g_tTex2df4' (uniform texture2D)
0:34 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -62,7 +62,7 @@ Shader version: 450
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of int)
0:35 'txval21' (temp 4-component vector of int)
0:35 textureGrad (global 4-component vector of int)
0:35 textureGrad (temp 4-component vector of int)
0:35 Construct combined texture-sampler (temp isampler2D)
0:35 'g_tTex2di4' (uniform itexture2D)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -78,7 +78,7 @@ Shader version: 450
0:36 Sequence
0:36 move second child to first child (temp 4-component vector of uint)
0:36 'txval22' (temp 4-component vector of uint)
0:36 textureGrad (global 4-component vector of uint)
0:36 textureGrad (temp 4-component vector of uint)
0:36 Construct combined texture-sampler (temp usampler2D)
0:36 'g_tTex2du4' (uniform utexture2D)
0:36 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -94,7 +94,7 @@ Shader version: 450
0:38 Sequence
0:38 move second child to first child (temp 4-component vector of float)
0:38 'txval30' (temp 4-component vector of float)
0:38 textureGrad (global 4-component vector of float)
0:38 textureGrad (temp 4-component vector of float)
0:38 Construct combined texture-sampler (temp sampler3D)
0:38 'g_tTex3df4' (uniform texture3D)
0:38 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -113,7 +113,7 @@ Shader version: 450
0:39 Sequence
0:39 move second child to first child (temp 4-component vector of int)
0:39 'txval31' (temp 4-component vector of int)
0:39 textureGrad (global 4-component vector of int)
0:39 textureGrad (temp 4-component vector of int)
0:39 Construct combined texture-sampler (temp isampler3D)
0:39 'g_tTex3di4' (uniform itexture3D)
0:39 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -132,7 +132,7 @@ Shader version: 450
0:40 Sequence
0:40 move second child to first child (temp 4-component vector of uint)
0:40 'txval32' (temp 4-component vector of uint)
0:40 textureGrad (global 4-component vector of uint)
0:40 textureGrad (temp 4-component vector of uint)
0:40 Construct combined texture-sampler (temp usampler3D)
0:40 'g_tTex3du4' (uniform utexture3D)
0:40 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -151,7 +151,7 @@ Shader version: 450
0:42 Sequence
0:42 move second child to first child (temp 4-component vector of float)
0:42 'txval40' (temp 4-component vector of float)
0:42 textureGrad (global 4-component vector of float)
0:42 textureGrad (temp 4-component vector of float)
0:42 Construct combined texture-sampler (temp samplerCube)
0:42 'g_tTexcdf4' (uniform textureCube)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -170,7 +170,7 @@ Shader version: 450
0:43 Sequence
0:43 move second child to first child (temp 4-component vector of int)
0:43 'txval41' (temp 4-component vector of int)
0:43 textureGrad (global 4-component vector of int)
0:43 textureGrad (temp 4-component vector of int)
0:43 Construct combined texture-sampler (temp isamplerCube)
0:43 'g_tTexcdi4' (uniform itextureCube)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -189,7 +189,7 @@ Shader version: 450
0:44 Sequence
0:44 move second child to first child (temp 4-component vector of uint)
0:44 'txval42' (temp 4-component vector of uint)
0:44 textureGrad (global 4-component vector of uint)
0:44 textureGrad (temp 4-component vector of uint)
0:44 Construct combined texture-sampler (temp usamplerCube)
0:44 'g_tTexcdu4' (uniform utextureCube)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -253,7 +253,7 @@ Shader version: 450
0:30 Sequence
0:30 move second child to first child (temp 4-component vector of float)
0:30 'txval10' (temp 4-component vector of float)
0:30 textureGrad (global 4-component vector of float)
0:30 textureGrad (temp 4-component vector of float)
0:30 Construct combined texture-sampler (temp sampler1D)
0:30 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:30 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -266,7 +266,7 @@ Shader version: 450
0:31 Sequence
0:31 move second child to first child (temp 4-component vector of int)
0:31 'txval11' (temp 4-component vector of int)
0:31 textureGrad (global 4-component vector of int)
0:31 textureGrad (temp 4-component vector of int)
0:31 Construct combined texture-sampler (temp isampler1D)
0:31 'g_tTex1di4' (uniform itexture1D)
0:31 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -279,7 +279,7 @@ Shader version: 450
0:32 Sequence
0:32 move second child to first child (temp 4-component vector of uint)
0:32 'txval12' (temp 4-component vector of uint)
0:32 textureGrad (global 4-component vector of uint)
0:32 textureGrad (temp 4-component vector of uint)
0:32 Construct combined texture-sampler (temp usampler1D)
0:32 'g_tTex1du4' (uniform utexture1D)
0:32 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -292,7 +292,7 @@ Shader version: 450
0:34 Sequence
0:34 move second child to first child (temp 4-component vector of float)
0:34 'txval20' (temp 4-component vector of float)
0:34 textureGrad (global 4-component vector of float)
0:34 textureGrad (temp 4-component vector of float)
0:34 Construct combined texture-sampler (temp sampler2D)
0:34 'g_tTex2df4' (uniform texture2D)
0:34 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -308,7 +308,7 @@ Shader version: 450
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of int)
0:35 'txval21' (temp 4-component vector of int)
0:35 textureGrad (global 4-component vector of int)
0:35 textureGrad (temp 4-component vector of int)
0:35 Construct combined texture-sampler (temp isampler2D)
0:35 'g_tTex2di4' (uniform itexture2D)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -324,7 +324,7 @@ Shader version: 450
0:36 Sequence
0:36 move second child to first child (temp 4-component vector of uint)
0:36 'txval22' (temp 4-component vector of uint)
0:36 textureGrad (global 4-component vector of uint)
0:36 textureGrad (temp 4-component vector of uint)
0:36 Construct combined texture-sampler (temp usampler2D)
0:36 'g_tTex2du4' (uniform utexture2D)
0:36 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -340,7 +340,7 @@ Shader version: 450
0:38 Sequence
0:38 move second child to first child (temp 4-component vector of float)
0:38 'txval30' (temp 4-component vector of float)
0:38 textureGrad (global 4-component vector of float)
0:38 textureGrad (temp 4-component vector of float)
0:38 Construct combined texture-sampler (temp sampler3D)
0:38 'g_tTex3df4' (uniform texture3D)
0:38 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -359,7 +359,7 @@ Shader version: 450
0:39 Sequence
0:39 move second child to first child (temp 4-component vector of int)
0:39 'txval31' (temp 4-component vector of int)
0:39 textureGrad (global 4-component vector of int)
0:39 textureGrad (temp 4-component vector of int)
0:39 Construct combined texture-sampler (temp isampler3D)
0:39 'g_tTex3di4' (uniform itexture3D)
0:39 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -378,7 +378,7 @@ Shader version: 450
0:40 Sequence
0:40 move second child to first child (temp 4-component vector of uint)
0:40 'txval32' (temp 4-component vector of uint)
0:40 textureGrad (global 4-component vector of uint)
0:40 textureGrad (temp 4-component vector of uint)
0:40 Construct combined texture-sampler (temp usampler3D)
0:40 'g_tTex3du4' (uniform utexture3D)
0:40 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -397,7 +397,7 @@ Shader version: 450
0:42 Sequence
0:42 move second child to first child (temp 4-component vector of float)
0:42 'txval40' (temp 4-component vector of float)
0:42 textureGrad (global 4-component vector of float)
0:42 textureGrad (temp 4-component vector of float)
0:42 Construct combined texture-sampler (temp samplerCube)
0:42 'g_tTexcdf4' (uniform textureCube)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -416,7 +416,7 @@ Shader version: 450
0:43 Sequence
0:43 move second child to first child (temp 4-component vector of int)
0:43 'txval41' (temp 4-component vector of int)
0:43 textureGrad (global 4-component vector of int)
0:43 textureGrad (temp 4-component vector of int)
0:43 Construct combined texture-sampler (temp isamplerCube)
0:43 'g_tTexcdi4' (uniform itextureCube)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -435,7 +435,7 @@ Shader version: 450
0:44 Sequence
0:44 move second child to first child (temp 4-component vector of uint)
0:44 'txval42' (temp 4-component vector of uint)
0:44 textureGrad (global 4-component vector of uint)
0:44 textureGrad (temp 4-component vector of uint)
0:44 Construct combined texture-sampler (temp usamplerCube)
0:44 'g_tTexcdu4' (uniform utextureCube)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)