Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Roll deps #2445

Merged
merged 3 commits into from
Feb 12, 2025
Merged

Roll deps #2445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
205f6d5
Roll deps.
HansKristian-Work Feb 12, 2025
2924511
Get rid of stale references.
HansKristian-Work Feb 12, 2025
a92e825
Try bumping to upload-artifacts v4.
HansKristian-Work Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
cmake --build . --config Release --parallel 4
cmake --build . --config Release --target install

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.platform }}-binaries
path: build/output
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
cmake --build . --config Release --parallel 4
cmake --build . --config Release --target install

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.sdk }}-binaries
path: build/output
Expand Down
6 changes: 3 additions & 3 deletions checkout_glslang_spirv_tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Copyright 2016-2021 The Khronos Group Inc.
# SPDX-License-Identifier: Apache-2.0

GLSLANG_REV=142052fa30f9eca191aa9dcf65359fcaed09eeec
SPIRV_TOOLS_REV=fd96922e9a1814d92df46df03277788c799a4fad
SPIRV_HEADERS_REV=ea77f2a826bc820cb8f57f9b2a7c7eccb681c73
GLSLANG_REV=b3a6aa7b03c51ba976e4f4e96b1e31f77f43f312
SPIRV_TOOLS_REV=4d2f0b40bfe290dea6c6904dafdf7fd8328ba346
SPIRV_HEADERS_REV=3f17b2af6784bfa2c5aa5dbb8e0e74a607dd8b3b
PROTOCOL=https

if [ -d external/glslang ]; then
Expand Down
21 changes: 12 additions & 9 deletions reference/opt/shaders-hlsl/comp/outer-product.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,41 @@ ByteAddressBuffer _26 : register(t1);

void comp_main()
{
float2x2 _32 = float2x2(asfloat(_26.Load2(0)) * asfloat(_26.Load2(0)).x, asfloat(_26.Load2(0)) * asfloat(_26.Load2(0)).y);
float2 _29 = asfloat(_26.Load2(0));
float2x2 _32 = float2x2(_29 * _29.x, _29 * _29.y);
_21.Store2(0, asuint(_32[0]));
_21.Store2(8, asuint(_32[1]));
float2x3 _41 = float2x3(asfloat(_26.Load3(16)) * asfloat(_26.Load2(0)).x, asfloat(_26.Load3(16)) * asfloat(_26.Load2(0)).y);
float3 _38 = asfloat(_26.Load3(16));
float2x3 _41 = float2x3(_38 * _29.x, _38 * _29.y);
_21.Store3(16, asuint(_41[0]));
_21.Store3(32, asuint(_41[1]));
float2x4 _50 = float2x4(asfloat(_26.Load4(32)) * asfloat(_26.Load2(0)).x, asfloat(_26.Load4(32)) * asfloat(_26.Load2(0)).y);
float4 _47 = asfloat(_26.Load4(32));
float2x4 _50 = float2x4(_47 * _29.x, _47 * _29.y);
_21.Store4(48, asuint(_50[0]));
_21.Store4(64, asuint(_50[1]));
float3x2 _58 = float3x2(asfloat(_26.Load2(0)) * asfloat(_26.Load3(16)).x, asfloat(_26.Load2(0)) * asfloat(_26.Load3(16)).y, asfloat(_26.Load2(0)) * asfloat(_26.Load3(16)).z);
float3x2 _58 = float3x2(_29 * _38.x, _29 * _38.y, _29 * _38.z);
_21.Store2(80, asuint(_58[0]));
_21.Store2(88, asuint(_58[1]));
_21.Store2(96, asuint(_58[2]));
float3x3 _66 = float3x3(asfloat(_26.Load3(16)) * asfloat(_26.Load3(16)).x, asfloat(_26.Load3(16)) * asfloat(_26.Load3(16)).y, asfloat(_26.Load3(16)) * asfloat(_26.Load3(16)).z);
float3x3 _66 = float3x3(_38 * _38.x, _38 * _38.y, _38 * _38.z);
_21.Store3(112, asuint(_66[0]));
_21.Store3(128, asuint(_66[1]));
_21.Store3(144, asuint(_66[2]));
float3x4 _74 = float3x4(asfloat(_26.Load4(32)) * asfloat(_26.Load3(16)).x, asfloat(_26.Load4(32)) * asfloat(_26.Load3(16)).y, asfloat(_26.Load4(32)) * asfloat(_26.Load3(16)).z);
float3x4 _74 = float3x4(_47 * _38.x, _47 * _38.y, _47 * _38.z);
_21.Store4(160, asuint(_74[0]));
_21.Store4(176, asuint(_74[1]));
_21.Store4(192, asuint(_74[2]));
float4x2 _82 = float4x2(asfloat(_26.Load2(0)) * asfloat(_26.Load4(32)).x, asfloat(_26.Load2(0)) * asfloat(_26.Load4(32)).y, asfloat(_26.Load2(0)) * asfloat(_26.Load4(32)).z, asfloat(_26.Load2(0)) * asfloat(_26.Load4(32)).w);
float4x2 _82 = float4x2(_29 * _47.x, _29 * _47.y, _29 * _47.z, _29 * _47.w);
_21.Store2(208, asuint(_82[0]));
_21.Store2(216, asuint(_82[1]));
_21.Store2(224, asuint(_82[2]));
_21.Store2(232, asuint(_82[3]));
float4x3 _90 = float4x3(asfloat(_26.Load3(16)) * asfloat(_26.Load4(32)).x, asfloat(_26.Load3(16)) * asfloat(_26.Load4(32)).y, asfloat(_26.Load3(16)) * asfloat(_26.Load4(32)).z, asfloat(_26.Load3(16)) * asfloat(_26.Load4(32)).w);
float4x3 _90 = float4x3(_38 * _47.x, _38 * _47.y, _38 * _47.z, _38 * _47.w);
_21.Store3(240, asuint(_90[0]));
_21.Store3(256, asuint(_90[1]));
_21.Store3(272, asuint(_90[2]));
_21.Store3(288, asuint(_90[3]));
float4x4 _98 = float4x4(asfloat(_26.Load4(32)) * asfloat(_26.Load4(32)).x, asfloat(_26.Load4(32)) * asfloat(_26.Load4(32)).y, asfloat(_26.Load4(32)) * asfloat(_26.Load4(32)).z, asfloat(_26.Load4(32)) * asfloat(_26.Load4(32)).w);
float4x4 _98 = float4x4(_47 * _47.x, _47 * _47.y, _47 * _47.z, _47 * _47.w);
_21.Store4(304, asuint(_98[0]));
_21.Store4(320, asuint(_98[1]));
_21.Store4(336, asuint(_98[2]));
Expand Down
54 changes: 0 additions & 54 deletions reference/opt/shaders-hlsl/frag/tex-sampling.sm30.frag
View file
Open in desktop

This file was deleted.

121 changes: 0 additions & 121 deletions reference/opt/shaders-msl/asm/frag/texture-atomics.asm.frag
View file
Open in desktop

This file was deleted.

122 changes: 0 additions & 122 deletions reference/opt/shaders-msl/asm/frag/texture-atomics.asm.graphics-robust-access.frag
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion reference/opt/shaders-msl/comp/coherent-block.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ struct SSBO

constant uint3 gl_WorkGroupSize [[maybe_unused]] = uint3(1u);

kernel void main0(volatile device SSBO& _10 [[buffer(0)]])
kernel void main0(volatile device SSBO& __restrict _10 [[buffer(0)]])
{
_10.value = float4(20.0);
}
Expand Down
2 changes: 1 addition & 1 deletion reference/opt/shaders-msl/comp/coherent-image.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ struct SSBO

constant uint3 gl_WorkGroupSize [[maybe_unused]] = uint3(1u);

kernel void main0(volatile device SSBO& _10 [[buffer(0)]], texture2d<int> uImage [[texture(0)]])
kernel void main0(volatile device SSBO& __restrict _10 [[buffer(0)]], texture2d<int> uImage [[texture(0)]])
{
_10.value = uImage.read(uint2(int2(10)));
}
Expand Down
Loading