diff --git a/tests/out/msl/workgroup-uniform-load.msl b/tests/out/msl/workgroup-uniform-load.msl index 29df3fff4d..cd85811d96 100644 --- a/tests/out/msl/workgroup-uniform-load.msl +++ b/tests/out/msl/workgroup-uniform-load.msl @@ -6,7 +6,7 @@ using metal::uint; constexpr constant unsigned SIZE = 128u; struct type_2 { - int inner[SIZE]; + int inner[128]; }; struct test_workgroupUniformLoadInput { diff --git a/tests/out/spv/workgroup-uniform-load.spvasm b/tests/out/spv/workgroup-uniform-load.spvasm index 8f30b48ac7..c8ae47c2fa 100644 --- a/tests/out/spv/workgroup-uniform-load.spvasm +++ b/tests/out/spv/workgroup-uniform-load.spvasm @@ -1,66 +1,67 @@ ; SPIR-V ; Version: 1.1 ; Generator: rspirv -; Bound: 40 +; Bound: 41 OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint GLCompute %15 "test_workgroupUniformLoad" %12 %19 +OpEntryPoint GLCompute %15 "test_workgroupUniformLoad" %12 %20 OpExecutionMode %15 LocalSize 4 1 1 -OpDecorate %7 ArrayStride 4 +OpDecorate %6 ArrayStride 4 OpDecorate %12 BuiltIn WorkgroupId -OpDecorate %19 BuiltIn LocalInvocationId +OpDecorate %20 BuiltIn LocalInvocationId %2 = OpTypeVoid %4 = OpTypeInt 32 0 %3 = OpConstant %4 128 -%6 = OpTypeInt 32 1 -%5 = OpConstant %6 10 -%7 = OpTypeArray %6 %3 +%5 = OpTypeInt 32 1 +%7 = OpConstant %4 128 +%6 = OpTypeArray %5 %7 %8 = OpTypeVector %4 3 -%10 = OpTypePointer Workgroup %7 +%10 = OpTypePointer Workgroup %6 %9 = OpVariable %10 Workgroup %13 = OpTypePointer Input %8 %12 = OpVariable %13 Input %16 = OpTypeFunction %2 -%18 = OpConstantNull %7 -%20 = OpTypePointer Input %8 -%19 = OpVariable %20 Input -%22 = OpConstantNull %8 -%24 = OpTypeBool -%23 = OpTypeVector %24 3 -%29 = OpConstant %4 2 -%30 = OpConstant %4 264 -%33 = OpTypePointer Workgroup %6 +%17 = OpConstant %5 10 +%19 = OpConstantNull %6 +%21 = OpTypePointer Input %8 +%20 = OpVariable %21 Input +%23 = OpConstantNull %8 +%25 = OpTypeBool +%24 = OpTypeVector %25 3 +%30 = OpConstant %4 2 +%31 = OpConstant %4 264 +%34 = OpTypePointer Workgroup %5 %15 = OpFunction %2 None %16 %11 = OpLabel %14 = OpLoad %8 %12 -OpBranch %17 -%17 = OpLabel -%21 = OpLoad %8 %19 -%25 = OpIEqual %23 %21 %22 -%26 = OpAll %24 %25 -OpSelectionMerge %27 None -OpBranchConditional %26 %28 %27 +OpBranch %18 +%18 = OpLabel +%22 = OpLoad %8 %20 +%26 = OpIEqual %24 %22 %23 +%27 = OpAll %25 %26 +OpSelectionMerge %28 None +OpBranchConditional %27 %29 %28 +%29 = OpLabel +OpStore %9 %19 +OpBranch %28 %28 = OpLabel -OpStore %9 %18 -OpBranch %27 -%27 = OpLabel -OpControlBarrier %29 %29 %30 -OpBranch %31 -%31 = OpLabel -%32 = OpCompositeExtract %4 %14 0 -OpControlBarrier %29 %29 %30 -%34 = OpAccessChain %33 %9 %32 -%35 = OpLoad %6 %34 -OpControlBarrier %29 %29 %30 -%36 = OpSGreaterThan %24 %35 %5 -OpSelectionMerge %37 None -OpBranchConditional %36 %38 %39 -%38 = OpLabel -OpControlBarrier %29 %29 %30 -OpReturn +OpControlBarrier %30 %30 %31 +OpBranch %32 +%32 = OpLabel +%33 = OpCompositeExtract %4 %14 0 +OpControlBarrier %30 %30 %31 +%35 = OpAccessChain %34 %9 %33 +%36 = OpLoad %5 %35 +OpControlBarrier %30 %30 %31 +%37 = OpSGreaterThan %25 %36 %17 +OpSelectionMerge %38 None +OpBranchConditional %37 %39 %40 %39 = OpLabel +OpControlBarrier %30 %30 %31 OpReturn -%37 = OpLabel +%40 = OpLabel +OpReturn +%38 = OpLabel OpReturn OpFunctionEnd \ No newline at end of file diff --git a/tests/out/wgsl/workgroup-uniform-load.wgsl b/tests/out/wgsl/workgroup-uniform-load.wgsl index aafd2cdc51..727ced8d6e 100644 --- a/tests/out/wgsl/workgroup-uniform-load.wgsl +++ b/tests/out/wgsl/workgroup-uniform-load.wgsl @@ -1,6 +1,6 @@ const SIZE: u32 = 128u; -var arr_i32_: array; +var arr_i32_: array; @compute @workgroup_size(4, 1, 1) fn test_workgroupUniformLoad(@builtin(workgroup_id) workgroup_id: vec3) {