diff options
author | dan sinclair <dsinclair@google.com> | 2020-05-20 17:27:49 +0300 |
---|---|---|
committer | dan sinclair <dsinclair@google.com> | 2020-05-20 17:27:51 +0300 |
commit | 8bf916f5758e272029a609a962b7d4c025f98cc7 (patch) | |
tree | cce2d350a5c1f10c320553cf77be433af15ca56a /reference/opt/shaders/asm | |
parent | 3c43f055df0d7b6948af64c825bf93beb8ab6418 (diff) |
Roll dependencies
This CL updates the GLSLang, SPIRV-Tools and SPIRV-Headers dependencies.
Diffstat (limited to 'reference/opt/shaders/asm')
9 files changed, 49 insertions, 49 deletions
diff --git a/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp b/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp index 6860cfaf..d30cddaf 100644 --- a/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp +++ b/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp @@ -13,7 +13,7 @@ layout(binding = 1, std430) buffer Buf_count void main() { - int _32 = atomicAdd(Buf_count_1._count, 1); - Buf_1._data[_32] = vec4(1.0); + int _33 = atomicAdd(Buf_count_1._count, 1); + Buf_1._data[_33] = vec4(1.0); } diff --git a/reference/opt/shaders/asm/comp/recompile-block-naming.asm.comp b/reference/opt/shaders/asm/comp/recompile-block-naming.asm.comp index ff83de34..7d43b6f5 100644 --- a/reference/opt/shaders/asm/comp/recompile-block-naming.asm.comp +++ b/reference/opt/shaders/asm/comp/recompile-block-naming.asm.comp @@ -18,18 +18,18 @@ layout(binding = 0, std430) buffer MyThirdBuffer void main() { - uint _105 = MyFirstBuffer_1._data[0]; - uint _109 = MyFirstBuffer_1._data[1]; - uint _113 = MyFirstBuffer_1._data[2]; - uint _117 = MyFirstBuffer_1._data[3]; - uint _122 = MySecondBuffer_1._data[1]; - uint _126 = MySecondBuffer_1._data[2]; - uint _130 = MySecondBuffer_1._data[3]; - uint _134 = MySecondBuffer_1._data[4]; - uvec4 _140 = uvec4(_105, _109, _113, _117) + uvec4(_122, _126, _130, _134); - MyThirdBuffer_1._data[0] = _140.x; - MyThirdBuffer_1._data[1] = _140.y; - MyThirdBuffer_1._data[2] = _140.z; - MyThirdBuffer_1._data[3] = _140.w; + uint _106 = MyFirstBuffer_1._data[0]; + uint _110 = MyFirstBuffer_1._data[1]; + uint _114 = MyFirstBuffer_1._data[2]; + uint _118 = MyFirstBuffer_1._data[3]; + uint _123 = MySecondBuffer_1._data[1]; + uint _127 = MySecondBuffer_1._data[2]; + uint _131 = MySecondBuffer_1._data[3]; + uint _135 = MySecondBuffer_1._data[4]; + uvec4 _141 = uvec4(_106, _110, _114, _118) + uvec4(_123, _127, _131, _135); + MyThirdBuffer_1._data[0] = _141.x; + MyThirdBuffer_1._data[1] = _141.y; + MyThirdBuffer_1._data[2] = _141.z; + MyThirdBuffer_1._data[3] = _141.w; } diff --git a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag index 452fd6fb..350142d4 100644 --- a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag +++ b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag @@ -7,7 +7,7 @@ layout(location = 0) out vec4 _entryPointOutput; void main() { - ivec2 _152 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy; - _entryPointOutput = ((texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _152, 0) + texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _152, 0)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy); + ivec2 _154 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy; + _entryPointOutput = ((texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _154, 0) + texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _154, 0)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy); } diff --git a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk index 55e2c2da..b898b01b 100644 --- a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk +++ b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk @@ -8,7 +8,7 @@ layout(location = 0) out vec4 _entryPointOutput; void main() { - ivec2 _152 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy; - _entryPointOutput = ((texelFetch(SampledImage, _152, 0) + texelFetch(SampledImage, _152, 0)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy); + ivec2 _154 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy; + _entryPointOutput = ((texelFetch(SampledImage, _154, 0) + texelFetch(SampledImage, _154, 0)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy); } diff --git a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag index 452fd6fb..350142d4 100644 --- a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag +++ b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag @@ -7,7 +7,7 @@ layout(location = 0) out vec4 _entryPointOutput; void main() { - ivec2 _152 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy; - _entryPointOutput = ((texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _152, 0) + texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _152, 0)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy); + ivec2 _154 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy; + _entryPointOutput = ((texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _154, 0) + texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _154, 0)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy); } diff --git a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag.vk b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag.vk index 23acab0b..21797b4c 100644 --- a/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag.vk +++ b/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag.vk @@ -8,7 +8,7 @@ layout(location = 0) out vec4 _entryPointOutput; void main() { - ivec2 _152 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy; - _entryPointOutput = ((texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _152, 0) + texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _152, 0)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy); + ivec2 _154 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0).xy; + _entryPointOutput = ((texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _154, 0) + texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _154, 0)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy); } diff --git a/reference/opt/shaders/asm/frag/line-directive.line.asm.frag b/reference/opt/shaders/asm/frag/line-directive.line.asm.frag index 74eb62bb..55408080 100644 --- a/reference/opt/shaders/asm/frag/line-directive.line.asm.frag +++ b/reference/opt/shaders/asm/frag/line-directive.line.asm.frag @@ -22,13 +22,13 @@ void main() #line 16 "test.frag" FragColor = 4.0; } - for (int _126 = 0; float(_126) < (40.0 + vColor); ) + for (int _127 = 0; float(_127) < (40.0 + vColor); ) { #line 21 "test.frag" FragColor += 0.20000000298023223876953125; #line 22 "test.frag" FragColor += 0.300000011920928955078125; - _126 += (int(vColor) + 5); + _127 += (int(vColor) + 5); continue; } switch (int(vColor)) diff --git a/reference/opt/shaders/asm/frag/loop-body-dominator-continue-access.asm.frag b/reference/opt/shaders/asm/frag/loop-body-dominator-continue-access.asm.frag index f3028a47..a0c47556 100644 --- a/reference/opt/shaders/asm/frag/loop-body-dominator-continue-access.asm.frag +++ b/reference/opt/shaders/asm/frag/loop-body-dominator-continue-access.asm.frag @@ -10,60 +10,60 @@ layout(binding = 0, std140) uniform Foo layout(location = 0) in vec3 fragWorld; layout(location = 0) out int _entryPointOutput; -int _228; +int _231; void main() { - int _225; + int _228; switch (0u) { default: { - bool _222; - int _226; - uint _219 = 0u; + bool _225; + int _229; + uint _222 = 0u; for (;;) { - if (_219 < _11.shadowCascadesNum) + if (_222 < _11.shadowCascadesNum) { - mat4 _220; + mat4 _223; switch (0u) { default: { if (_11.test == 0) { - _220 = mat4(vec4(0.5, 0.0, 0.0, 0.0), vec4(0.0, 0.5, 0.0, 0.0), vec4(0.0, 0.0, 0.5, 0.0), vec4(0.0, 0.0, 0.0, 1.0)); + _223 = mat4(vec4(0.5, 0.0, 0.0, 0.0), vec4(0.0, 0.5, 0.0, 0.0), vec4(0.0, 0.0, 0.5, 0.0), vec4(0.0, 0.0, 0.0, 1.0)); break; } - _220 = mat4(vec4(1.0, 0.0, 0.0, 0.0), vec4(0.0, 1.0, 0.0, 0.0), vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0)); + _223 = mat4(vec4(1.0, 0.0, 0.0, 0.0), vec4(0.0, 1.0, 0.0, 0.0), vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0)); break; } } - vec4 _171 = (_220 * _11.lightVP[_219]) * vec4(fragWorld, 1.0); - float _173 = _171.z; - float _180 = _171.x; - float _182 = _171.y; - if ((((_173 >= 0.0) && (_173 <= 1.0)) && (max(_180, _182) <= 1.0)) && (min(_180, _182) >= 0.0)) + vec4 _170 = (_223 * _11.lightVP[_222]) * vec4(fragWorld, 1.0); + float _172 = _170.z; + float _179 = _170.x; + float _181 = _170.y; + if ((((_172 >= 0.0) && (_172 <= 1.0)) && (max(_179, _181) <= 1.0)) && (min(_179, _181) >= 0.0)) { - _226 = int(_219); - _222 = true; + _229 = int(_222); + _225 = true; break; } - _219++; + _222++; continue; } else { - _226 = _228; - _222 = false; + _229 = _231; + _225 = false; break; } } - _225 = -1; + _228 = -1; break; } } - _entryPointOutput = _225; + _entryPointOutput = _228; } diff --git a/reference/opt/shaders/asm/geom/unroll-glposition-load.asm.geom b/reference/opt/shaders/asm/geom/unroll-glposition-load.asm.geom index d1f8963f..0b1f5ca7 100644 --- a/reference/opt/shaders/asm/geom/unroll-glposition-load.asm.geom +++ b/reference/opt/shaders/asm/geom/unroll-glposition-load.asm.geom @@ -10,11 +10,11 @@ void main() _35_unrolled[i] = gl_in[i].gl_Position; } vec4 param[3] = _35_unrolled; - for (int _73 = 0; _73 < 3; ) + for (int _74 = 0; _74 < 3; ) { - gl_Position = param[_73]; + gl_Position = param[_74]; EmitVertex(); - _73++; + _74++; continue; } EndPrimitive(); |