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:
authorHans-Kristian Arntzen <post@arntzen-software.no>2022-01-05 16:51:36 +0300
committerHans-Kristian Arntzen <post@arntzen-software.no>2022-01-05 16:56:01 +0300
commitfe8848a6f240acf00fd8decb94c44c81174271e3 (patch)
tree7a76d17b72d212f17003ae13063a3ecc613023a0 /reference/opt/shaders
parent9c0b74f73b13b39258f06580e8670305372c8102 (diff)
Roll dependencies.
Diffstat (limited to 'reference/opt/shaders')
-rw-r--r--reference/opt/shaders/asm/frag/line-directive.line.asm.frag2
-rw-r--r--reference/opt/shaders/asm/frag/pack-and-unpack-uint2.asm.frag3
-rw-r--r--reference/opt/shaders/frag/texel-fetch-offset.frag2
-rw-r--r--reference/opt/shaders/geom/geometry-passthrough.geom5
-rw-r--r--reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk1
-rw-r--r--reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk14
-rw-r--r--reference/opt/shaders/vulkan/comp/ray-query.nocompat.spv14.vk.comp.vk10
-rw-r--r--reference/opt/shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk20
8 files changed, 35 insertions, 22 deletions
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 4c108eda..4682d79e 100644
--- a/reference/opt/shaders/asm/frag/line-directive.line.asm.frag
+++ b/reference/opt/shaders/asm/frag/line-directive.line.asm.frag
@@ -63,8 +63,6 @@ void main()
#line 42 "test.frag"
FragColor += (10.0 + vColor);
#line 43 "test.frag"
-#line 42 "test.frag"
-#line 43 "test.frag"
if (FragColor < 100.0)
{
}
diff --git a/reference/opt/shaders/asm/frag/pack-and-unpack-uint2.asm.frag b/reference/opt/shaders/asm/frag/pack-and-unpack-uint2.asm.frag
index 6d81fa61..f2a2a40f 100644
--- a/reference/opt/shaders/asm/frag/pack-and-unpack-uint2.asm.frag
+++ b/reference/opt/shaders/asm/frag/pack-and-unpack-uint2.asm.frag
@@ -1,11 +1,10 @@
#version 450
-#extension GL_ARB_gpu_shader_int64 : require
layout(location = 0) out vec4 FragColor;
void main()
{
- uvec2 unpacked = unpackUint2x32(packUint2x32(uvec2(18u, 52u)));
+ uvec2 unpacked = uvec2(18u, 52u);
FragColor = vec4(float(unpacked.x), float(unpacked.y), 1.0, 1.0);
}
diff --git a/reference/opt/shaders/frag/texel-fetch-offset.frag b/reference/opt/shaders/frag/texel-fetch-offset.frag
index 416f764d..520b4ee8 100644
--- a/reference/opt/shaders/frag/texel-fetch-offset.frag
+++ b/reference/opt/shaders/frag/texel-fetch-offset.frag
@@ -8,7 +8,7 @@ layout(location = 0) out vec4 FragColor;
void main()
{
- mediump ivec2 _22 = ivec2(gl_FragCoord.xy);
+ ivec2 _22 = ivec2(gl_FragCoord.xy);
FragColor = texelFetchOffset(uTexture, _22, 0, ivec2(1));
FragColor += texelFetchOffset(uTexture, _22, 0, ivec2(-1, 1));
}
diff --git a/reference/opt/shaders/geom/geometry-passthrough.geom b/reference/opt/shaders/geom/geometry-passthrough.geom
index d0d8806a..afbd6623 100644
--- a/reference/opt/shaders/geom/geometry-passthrough.geom
+++ b/reference/opt/shaders/geom/geometry-passthrough.geom
@@ -2,11 +2,6 @@
#extension GL_NV_geometry_shader_passthrough : require
layout(triangles) in;
-layout(passthrough) in gl_PerVertex
-{
- vec4 gl_Position;
-} gl_in[];
-
layout(passthrough, location = 0) in VertexBlock
{
int a;
diff --git a/reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk b/reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk
index a5a66b19..1808beec 100644
--- a/reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk
+++ b/reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk
@@ -23,6 +23,7 @@ layout(push_constant, std430) uniform Push
void main()
{
+ uint v = _15.bar.b;
uint _31 = atomicAdd(_15.bar.a, _15.bar.b);
}
diff --git a/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk b/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk
index de0964b1..1ec204b0 100644
--- a/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk
+++ b/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk
@@ -19,17 +19,31 @@ layout(set = 0, binding = 0, std430) restrict buffer LinkedList
void main()
{
+ Node _45;
Node _114;
if (gl_WorkGroupID.x < 4u)
{
+ _45 = _50.head1;
_114 = _50.head1;
}
else
{
+ _45 = _50.head2;
_114 = _50.head2;
}
+ restrict Node n = _114;
+ Node param = _114.next;
+ Node param_1 = _50.head1;
+ Node param_2 = _50.head2;
_114.next.value = _50.head1.value + _50.head2.value;
+ Node param_4 = _50.head1;
+ Node param_3 = _50.head1;
+ n = _50.head1;
+ int v = _50.head2.value;
_50.head1.value = 20;
_50.head1.value = _50.head2.value * 10;
+ uint64_t _98 = uint64_t(_50.head2.next);
+ uint64_t uptr = _98;
+ Node unode = Node(_98);
}
diff --git a/reference/opt/shaders/vulkan/comp/ray-query.nocompat.spv14.vk.comp.vk b/reference/opt/shaders/vulkan/comp/ray-query.nocompat.spv14.vk.comp.vk
index dcd37387..eda045dc 100644
--- a/reference/opt/shaders/vulkan/comp/ray-query.nocompat.spv14.vk.comp.vk
+++ b/reference/opt/shaders/vulkan/comp/ray-query.nocompat.spv14.vk.comp.vk
@@ -43,10 +43,10 @@ void main()
int _99 = rayQueryGetIntersectionGeometryIndexEXT(q2[1], bool(0));
int _100 = rayQueryGetIntersectionPrimitiveIndexEXT(q, bool(1));
vec2 _103 = rayQueryGetIntersectionBarycentricsEXT(q2[0], bool(0));
- bool _106 = rayQueryGetIntersectionFrontFaceEXT(q, bool(1));
- vec3 _107 = rayQueryGetIntersectionObjectRayDirectionEXT(q, bool(0));
- vec3 _109 = rayQueryGetIntersectionObjectRayOriginEXT(q2[0], bool(1));
- mat4x3 _113 = rayQueryGetIntersectionObjectToWorldEXT(q, bool(0));
- mat4x3 _115 = rayQueryGetIntersectionWorldToObjectEXT(q2[1], bool(1));
+ bool _110 = rayQueryGetIntersectionFrontFaceEXT(q, bool(1));
+ vec3 _111 = rayQueryGetIntersectionObjectRayDirectionEXT(q, bool(0));
+ vec3 _113 = rayQueryGetIntersectionObjectRayOriginEXT(q2[0], bool(1));
+ mat4x3 _117 = rayQueryGetIntersectionObjectToWorldEXT(q, bool(0));
+ mat4x3 _119 = rayQueryGetIntersectionWorldToObjectEXT(q2[1], bool(1));
}
diff --git a/reference/opt/shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk b/reference/opt/shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk
index 74e375fd..891ed232 100644
--- a/reference/opt/shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk
+++ b/reference/opt/shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk
@@ -43,16 +43,22 @@ void main()
FragColor = texelFetch(uSamplers[nonuniformEXT(_49)], _111, 0);
int _116 = vIndex + 100;
uint _122 = atomicAdd(ssbos[_116].counter, 100u);
- vec2 _149 = FragColor.xy + (textureQueryLod(nonuniformEXT(sampler2D(uSamplers[_22], uSamps[_32])), vUV) + textureQueryLod(uCombinedSamplers[nonuniformEXT(_49)], vUV));
- FragColor = vec4(_149.x, _149.y, FragColor.z, FragColor.w);
+ vec4 _147 = FragColor;
+ vec2 _149 = _147.xy + (textureQueryLod(nonuniformEXT(sampler2D(uSamplers[_22], uSamps[_32])), vUV) + textureQueryLod(uCombinedSamplers[nonuniformEXT(_49)], vUV));
+ FragColor.x = _149.x;
+ FragColor.y = _149.y;
FragColor.x += float(textureQueryLevels(uSamplers[nonuniformEXT(_65)]));
FragColor.y += float(textureSamples(uSamplersMS[nonuniformEXT(_65)]));
- vec2 _189 = FragColor.xy + vec2(textureSize(uSamplers[nonuniformEXT(_65)], 0));
- FragColor = vec4(_189.x, _189.y, FragColor.z, FragColor.w);
+ vec4 _189 = FragColor;
+ vec2 _191 = _189.xy + vec2(textureSize(uSamplers[nonuniformEXT(_65)], 0));
+ FragColor.x = _191.x;
+ FragColor.y = _191.y;
FragColor += imageLoad(uImages[nonuniformEXT(_83)], _111);
- vec2 _216 = FragColor.xy + vec2(imageSize(uImages[nonuniformEXT(_65)]));
- FragColor = vec4(_216.x, _216.y, FragColor.z, FragColor.w);
+ vec4 _218 = FragColor;
+ vec2 _220 = _218.xy + vec2(imageSize(uImages[nonuniformEXT(_65)]));
+ FragColor.x = _220.x;
+ FragColor.y = _220.y;
imageStore(uImages[nonuniformEXT(_88)], _111, vec4(50.0));
- uint _242 = imageAtomicAdd(uImagesU32[nonuniformEXT(_100)], _111, 40u);
+ uint _248 = imageAtomicAdd(uImagesU32[nonuniformEXT(_100)], _111, 40u);
}