Merge fixes

packages/typegpu/setupVitest.ts

@@ -3,4 +3,5 @@ import { setup } from '@ark/attest';
 export default () =>
   setup({
     formatCmd: 'pnpm fix',
+    skipTypes: true,
   });

packages/typegpu/tests/examples/individual/log-test.test.ts

@@ -79,17 +79,9 @@ describe('console log example', () => {
         @builtin(global_invocation_id) id: vec3u,
       }
 
-<<<<<<< HEAD
       @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_12)  {
-          if (any(in.id >= sizeUniform_1)) {
-            return;
-          }
-          wrappedCallback_2(in.id.x, in.id.y, in.id.z);
-=======
-      @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_8)  {
         if (any(in.id >= sizeUniform_1)) {
           return;
->>>>>>> origin/main
         }
         wrappedCallback_2(in.id.x, in.id.y, in.id.z);
       }
@@ -115,8 +107,8 @@ describe('console log example', () => {
         return i;
       }
 
-      fn serializeI32_10(n: i32) {
-        dataBuffer_5[dataBlockIndex_7].serializedData[nextByteIndex_11()] = bitcast<u32>(n);
+      fn serializeU32_10(n: u32) {
+        dataBuffer_5[dataBlockIndex_7].serializedData[nextByteIndex_11()] = n;
       }
 
       fn serializeVec3u_12(v: vec3u) {
@@ -125,14 +117,14 @@ describe('console log example', () => {
         dataBuffer_5[dataBlockIndex_7].serializedData[nextByteIndex_11()] = v.z;
       }
 
-      fn log1serializer_9(_arg_0: i32, _arg_1: vec3u, _arg_2: i32, _arg_3: i32) {
-        serializeI32_10(_arg_0);
+      fn log1serializer_9(_arg_0: u32, _arg_1: vec3u, _arg_2: u32, _arg_3: u32) {
+        serializeU32_10(_arg_0);
         serializeVec3u_12(_arg_1);
-        serializeI32_10(_arg_2);
-        serializeI32_10(_arg_3);
+        serializeU32_10(_arg_2);
+        serializeU32_10(_arg_3);
       }
 
-      fn log1_3(_arg_0: i32, _arg_1: vec3u, _arg_2: i32, _arg_3: i32) {
+      fn log1_3(_arg_0: u32, _arg_1: vec3u, _arg_2: u32, _arg_3: u32) {
         dataBlockIndex_7 = atomicAdd(&indexBuffer_4, 1);
         if (dataBlockIndex_7 >= 40) {
           return;
@@ -151,17 +143,9 @@ describe('console log example', () => {
         @builtin(global_invocation_id) id: vec3u,
       }
 
-<<<<<<< HEAD
       @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_13)  {
-          if (any(in.id >= sizeUniform_1)) {
-            return;
-          }
-          wrappedCallback_2(in.id.x, in.id.y, in.id.z);
-=======
-      @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_9)  {
         if (any(in.id >= sizeUniform_1)) {
           return;
->>>>>>> origin/main
         }
         wrappedCallback_2(in.id.x, in.id.y, in.id.z);
       }
@@ -187,17 +171,17 @@ describe('console log example', () => {
         return i;
       }
 
-      fn serializeI32_10(n: i32) {
-        dataBuffer_5[dataBlockIndex_7].serializedData[nextByteIndex_11()] = bitcast<u32>(n);
+      fn serializeU32_10(n: u32) {
+        dataBuffer_5[dataBlockIndex_7].serializedData[nextByteIndex_11()] = n;
       }
 
-      fn log1serializer_9(_arg_0: i32, _arg_1: i32, _arg_2: i32) {
-        serializeI32_10(_arg_0);
-        serializeI32_10(_arg_1);
-        serializeI32_10(_arg_2);
+      fn log1serializer_9(_arg_0: u32, _arg_1: u32, _arg_2: u32) {
+        serializeU32_10(_arg_0);
+        serializeU32_10(_arg_1);
+        serializeU32_10(_arg_2);
       }
 
-      fn log1_3(_arg_0: i32, _arg_1: i32, _arg_2: i32) {
+      fn log1_3(_arg_0: u32, _arg_1: u32, _arg_2: u32) {
         dataBlockIndex_7 = atomicAdd(&indexBuffer_4, 1);
         if (dataBlockIndex_7 >= 40) {
           return;
@@ -216,17 +200,9 @@ describe('console log example', () => {
         @builtin(global_invocation_id) id: vec3u,
       }
 
-<<<<<<< HEAD
       @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_12)  {
-          if (any(in.id >= sizeUniform_1)) {
-            return;
-          }
-          wrappedCallback_2(in.id.x, in.id.y, in.id.z);
-=======
-      @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_8)  {
         if (any(in.id >= sizeUniform_1)) {
           return;
->>>>>>> origin/main
         }
         wrappedCallback_2(in.id.x, in.id.y, in.id.z);
       }
@@ -854,78 +830,18 @@ describe('console log example', () => {
         @builtin(global_invocation_id) id: vec3u,
       }
 
-<<<<<<< HEAD
       @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_86)  {
-          if (any(in.id >= sizeUniform_1)) {
-            return;
-          }
-          wrappedCallback_2(in.id.x, in.id.y, in.id.z);
-=======
-      @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_54)  {
         if (any(in.id >= sizeUniform_1)) {
           return;
->>>>>>> origin/main
         }
         wrappedCallback_2(in.id.x, in.id.y, in.id.z);
       }
 
       @group(0) @binding(0) var<uniform> sizeUniform_1: vec3u;
 
-<<<<<<< HEAD
       struct SimpleStruct_3 {
         vec: vec3u,
         num: u32,
-=======
-      @group(0) @binding(1) var<storage, read_write> indexBuffer_4: atomic<u32>;
-
-      struct SerializedLogData_6 {
-        id: u32,
-        serializedData: array<u32, 32>,
-      }
-
-      @group(0) @binding(2) var<storage, read_write> dataBuffer_5: array<SerializedLogData_6, 40>;
-
-      fn log1_3() {
-        var index = atomicAdd(&indexBuffer_4, 1);
-        if (index >= 40) {
-          return;
-        }
-        dataBuffer_5[index].id = 1;
-
-
-      }
-
-      fn log2_7() {
-        var index = atomicAdd(&indexBuffer_4, 1);
-        if (index >= 40) {
-          return;
-        }
-        dataBuffer_5[index].id = 2;
-
-
-      }
-
-      fn wrappedCallback_2(_arg_0: u32, _arg_1: u32, _arg_2: u32) {
-        log1_3();
-        log2_7();
-      }
-
-      struct mainCompute_Input_8 {
-        @builtin(global_invocation_id) id: vec3u,
-      }
-
-      @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_8)  {
-        if (any(in.id >= sizeUniform_1)) {
-          return;
-        }
-        wrappedCallback_2(in.id.x, in.id.y, in.id.z);
-      }
-
-      @group(0) @binding(0) var<uniform> sizeUniform_1: vec3u;
-
-      fn serializeU32_4(n: u32) -> array<u32,1>{
-        return array<u32, 1>(n);
->>>>>>> origin/main
       }
 
       @group(0) @binding(1) var<storage, read_write> indexBuffer_5: atomic<u32>;
@@ -1085,11 +1001,11 @@ describe('console log example', () => {
       }
 
       @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_31)  {
-          if (any(in.id >= sizeUniform_1)) {
-            return;
-          }
-          wrappedCallback_2(in.id.x, in.id.y, in.id.z);
+        if (any(in.id >= sizeUniform_1)) {
+          return;
         }
+        wrappedCallback_2(in.id.x, in.id.y, in.id.z);
+      }
 
       @group(0) @binding(0) var<uniform> sizeUniform_1: vec3u;
 
@@ -1146,11 +1062,11 @@ describe('console log example', () => {
       }
 
       @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_12)  {
-          if (any(in.id >= sizeUniform_1)) {
-            return;
-          }
-          wrappedCallback_2(in.id.x, in.id.y, in.id.z);
+        if (any(in.id >= sizeUniform_1)) {
+          return;
         }
+        wrappedCallback_2(in.id.x, in.id.y, in.id.z);
+      }
 
       @group(0) @binding(0) var<uniform> sizeUniform_1: vec3u;
 
@@ -1200,17 +1116,9 @@ describe('console log example', () => {
         @builtin(global_invocation_id) id: vec3u,
       }
 
-<<<<<<< HEAD
       @compute @workgroup_size(256, 1, 1) fn mainCompute_0(in: mainCompute_Input_12)  {
-          if (any(in.id >= sizeUniform_1)) {
-            return;
-          }
-          wrappedCallback_2(in.id.x, in.id.y, in.id.z);
-=======
-      @compute @workgroup_size(256, 1, 1) fn mainCompute_0(in: mainCompute_Input_8)  {
         if (any(in.id >= sizeUniform_1)) {
           return;
->>>>>>> origin/main
         }
         wrappedCallback_2(in.id.x, in.id.y, in.id.z);
       }
@@ -1265,17 +1173,9 @@ describe('console log example', () => {
         @builtin(global_invocation_id) id: vec3u,
       }
 
-<<<<<<< HEAD
       @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_13)  {
-          if (any(in.id >= sizeUniform_1)) {
-            return;
-          }
-          wrappedCallback_2(in.id.x, in.id.y, in.id.z);
-=======
-      @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_9)  {
         if (any(in.id >= sizeUniform_1)) {
           return;
->>>>>>> origin/main
         }
         wrappedCallback_2(in.id.x, in.id.y, in.id.z);
       }
@@ -1333,17 +1233,9 @@ describe('console log example', () => {
         @builtin(global_invocation_id) id: vec3u,
       }
 
-<<<<<<< HEAD
       @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_13)  {
-          if (any(in.id >= sizeUniform_1)) {
-            return;
-          }
-          wrappedCallback_2(in.id.x, in.id.y, in.id.z);
-=======
-      @compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_9)  {
         if (any(in.id >= sizeUniform_1)) {
           return;
->>>>>>> origin/main
         }
         wrappedCallback_2(in.id.x, in.id.y, in.id.z);
       }
@@ -1489,21 +1381,12 @@ describe('console log example', () => {
         @builtin(global_invocation_id) id: vec3u,
       }
 
-<<<<<<< HEAD
       @compute @workgroup_size(256, 1, 1) fn mainCompute_0(in: mainCompute_Input_16)  {
-          if (any(in.id >= sizeUniform_1)) {
-            return;
-          }
-          wrappedCallback_2(in.id.x, in.id.y, in.id.z);
-        }"
-=======
-      @compute @workgroup_size(256, 1, 1) fn mainCompute_0(in: mainCompute_Input_10)  {
         if (any(in.id >= sizeUniform_1)) {
           return;
         }
         wrappedCallback_2(in.id.x, in.id.y, in.id.z);
       }"
->>>>>>> origin/main
     `);
   });
 });