Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/KhronosGroup/SPIRV-Cross.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordan sinclair <dsinclair@google.com>2020-04-23 17:53:49 +0300
committerdan sinclair <dsinclair@google.com>2020-04-23 17:53:49 +0300
commit171c64647492dfe7a807556bfbbead98fd67834d (patch)
tree02622e5ab43e0fa835cd66799c96ba09e3330d05 /reference/opt/shaders-msl
parent1ad1662a2b4a41ed0076750b0cc2732cb89a19e8 (diff)
Roll GLSLang, SPIRV-Tools and SPIRV-Headers.
This CL rolls the various dependencies and updates tests to match.
Diffstat (limited to 'reference/opt/shaders-msl')
-rw-r--r--reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag5
-rw-r--r--reference/opt/shaders-msl/frag/swizzle.frag8
2 files changed, 8 insertions, 5 deletions
diff --git a/reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag b/reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag
index bf919533..f8dc4201 100644
--- a/reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag
+++ b/reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag
@@ -88,9 +88,10 @@ fragment main0_out main0(main0_in in [[stage_in]], constant spvDescriptorSetBuff
constant uint* spvDescriptorSet0_uSampler0Swzl = &spvDescriptorSet0.spvSwizzleConstants[0];
constant uint& uSampler1Swzl = spvSwizzleConstants[0];
out.FragColor = spvTextureSwizzle(spvDescriptorSet0.uSampler0[2].sample(spvDescriptorSet0.uSampler0Smplr[2], in.vUV), spvDescriptorSet0_uSampler0Swzl[2]);
- out.FragColor += spvTextureSwizzle(uSampler1.sample(uSampler1Smplr, in.vUV), uSampler1Swzl);
+ float4 _71 = spvTextureSwizzle(uSampler1.sample(uSampler1Smplr, in.vUV), uSampler1Swzl);
+ out.FragColor += _71;
out.FragColor += spvTextureSwizzle(spvDescriptorSet0.uSampler0[1].sample(spvDescriptorSet0.uSampler0Smplr[1], in.vUV), spvDescriptorSet0_uSampler0Swzl[1]);
- out.FragColor += spvTextureSwizzle(uSampler1.sample(uSampler1Smplr, in.vUV), uSampler1Swzl);
+ out.FragColor += _71;
return out;
}
diff --git a/reference/opt/shaders-msl/frag/swizzle.frag b/reference/opt/shaders-msl/frag/swizzle.frag
index 7a0494e0..cda23096 100644
--- a/reference/opt/shaders-msl/frag/swizzle.frag
+++ b/reference/opt/shaders-msl/frag/swizzle.frag
@@ -17,9 +17,11 @@ struct main0_in
fragment main0_out main0(main0_in in [[stage_in]], texture2d<float> samp [[texture(0)]], sampler sampSmplr [[sampler(0)]])
{
main0_out out = {};
- out.FragColor = float4(samp.sample(sampSmplr, in.vUV).xyz, 1.0);
- out.FragColor = float4(samp.sample(sampSmplr, in.vUV).xz, 1.0, 4.0);
- out.FragColor = float4(samp.sample(sampSmplr, in.vUV).xx, samp.sample(sampSmplr, (in.vUV + float2(0.100000001490116119384765625))).yy);
+ float4 _19 = samp.sample(sampSmplr, in.vUV);
+ float _23 = _19.x;
+ out.FragColor = float4(_23, _19.yz, 1.0);
+ out.FragColor = float4(_23, _19.z, 1.0, 4.0);
+ out.FragColor = float4(_23, _23, samp.sample(sampSmplr, (in.vUV + float2(0.100000001490116119384765625))).yy);
out.FragColor = float4(in.vNormal, 1.0);
out.FragColor = float4(in.vNormal + float3(1.7999999523162841796875), 1.0);
out.FragColor = float4(in.vUV, in.vUV + float2(1.7999999523162841796875));