fix: Proper type coersion for vector & scalar operations

Author: iwoplaza

packages/typegpu/src/data/matrix.ts

@@ -105,6 +105,7 @@ function createMatSchema<
   const schema = Object.assign(construct, {
     [$internal]: {},
     type: options.type,
+    primitive: f32,
     identity: identityFunctions[options.columns],
     translation: options.columns === 4 ? translation4 : undefined,
     scaling: options.columns === 4 ? scaling4 : undefined,

packages/typegpu/src/data/wgslTypes.ts

@@ -1240,6 +1240,7 @@ export interface Vec4b extends
  */
 export interface Mat2x2f extends BaseData {
   readonly type: 'mat2x2f';
+  readonly primitive: F32;
 
   // Type-tokens, not available at runtime
   readonly [$repr]: m2x2f;
@@ -1258,6 +1259,7 @@ export interface Mat2x2f extends BaseData {
  */
 export interface Mat3x3f extends BaseData {
   readonly type: 'mat3x3f';
+  readonly primitive: F32;
 
   // Type-tokens, not available at runtime
   readonly [$repr]: m3x3f;
@@ -1277,6 +1279,7 @@ export interface Mat3x3f extends BaseData {
  */
 export interface Mat4x4f extends BaseData {
   readonly type: 'mat4x4f';
+  readonly primitive: F32;
 
   // Type-tokens, not available at runtime
   readonly [$repr]: m4x4f;

packages/typegpu/src/tgsl/conversion.ts

@@ -272,14 +272,18 @@ export function unify<T extends (BaseData | UnknownData)[] | []>(
     return undefined;
   }
 
-  const conversion = getBestConversion(inTypes as BaseData[], restrictTo);
+  const primitiveTypes = inTypes.map((type) =>
+    isVec(type) || isMat(type) ? type.primitive : type as BaseData
+  );
+
+  const conversion = getBestConversion(primitiveTypes, restrictTo);
   if (!conversion) {
     return undefined;
   }
 
-  return inTypes.map(() => conversion.targetType) as {
-    [K in keyof T]: BaseData;
-  };
+  return inTypes.map((type) =>
+    isVec(type) || isMat(type) ? type : conversion.targetType
+  ) as { [K in keyof T]: BaseData };
 }
 
 export function convertToCommonType<T extends Snippet[]>(

packages/typegpu/tests/examples/individual/3d-fish.test.ts

@@ -186,8 +186,8 @@ describe('3d fish example', () => {
         direction = (direction + (separation * fishBehavior.separationStr));
         direction = (direction + (alignment * fishBehavior.alignmentStr));
         direction = (direction + (cohesion * fishBehavior.cohesionStr));
-        direction = (direction + (wallRepulsion * 1e-4));
-        direction = (direction + (rayRepulsion * 0.0015));
+        direction = (direction + (wallRepulsion * 1e-4f));
+        direction = (direction + (rayRepulsion * 0.0015f));
         direction = (normalize(direction) * clamp(length((*fishData).direction), 0f, 0.01f));
         var translation = (direction * (min(999f, timePassed) / 8f));
         let nextFishData_1 = (&nextFishData[fishIndex]);
@@ -403,7 +403,7 @@ describe('3d fish example', () => {
       @fragment fn fragmentShader(input: fragmentShader_Input) -> @location(0) vec4f {
         var textureColorWithAlpha = textureSample(modelTexture, sampler_1, input.textureUV);
         var textureColor = textureColorWithAlpha.xyz;
-        var ambient = (0.5 * (textureColor * vec3f(0.800000011920929, 0.800000011920929, 1)));
+        var ambient = (0.5f * (textureColor * vec3f(0.800000011920929, 0.800000011920929, 1)));
         let cosTheta = dot(input.worldNormal, vec3f(-0.2357022613286972, 0.9428090453147888, -0.2357022613286972));
         var diffuse = (max(0f, cosTheta) * (textureColor * vec3f(0.800000011920929, 0.800000011920929, 1)));
         var viewSource = normalize((camera.position.xyz - input.worldPosition));

packages/typegpu/tests/examples/individual/ascii-filter.test.ts

@@ -46,7 +46,7 @@ describe('ascii filter example', () => {
       @group(0) @binding(4) var<uniform> charsetExtended: u32;
 
       fn characterFn(n: u32, p: vec2f) -> f32 {
-        var pos = floor(((p * vec2f(-4, 4)) + 2.5));
+        var pos = floor(((p * vec2f(-4, 4)) + 2.5f));
         if (((((pos.x < 0f) || (pos.x > 4f)) || (pos.y < 0f)) || (pos.y > 4f))) {
           return 0f;
         }
@@ -61,7 +61,7 @@ describe('ascii filter example', () => {
       }
 
       @fragment fn fragmentFn(input: fragmentFn_Input) -> @location(0) vec4f {
-        var uv2 = ((uvTransformBuffer * (input.uv - 0.5)) + 0.5);
+        var uv2 = ((uvTransformBuffer * (input.uv - 0.5f)) + 0.5f);
         var textureSize = vec2f(textureDimensions(externalTexture));
         var pix = (uv2 * textureSize);
         let cellSize = f32(glyphSize);

packages/typegpu/tests/examples/individual/boids.test.ts

@@ -130,7 +130,7 @@ describe('boids example', () => {
         let angle = getRotationFromVelocity(input.velocity);
         var rotated = rotate(input.v, angle);
         var pos = vec4f((rotated + input.center), 0f, 1f);
-        var color = vec4f(((sin((colorPalette + angle)) * 0.45) + 0.45), 1f);
+        var color = vec4f(((sin((colorPalette + angle)) * 0.45f) + 0.45f), 1f);
         return mainVert_Output(pos, color);
       }
 

packages/typegpu/tests/examples/individual/box-raytracing.test.ts

@@ -124,7 +124,7 @@ describe('box raytracing example', () => {
       @group(0) @binding(1) var<storage, read> boxMatrix: array<array<array<BoxStruct, 7>, 7>, 7>;
 
       fn linearToSrgb(linear: vec3f) -> vec3f {
-        return select((12.92 * linear), ((1.055 * pow(linear, vec3f(0.4166666567325592))) - vec3f(0.054999999701976776)), (linear > vec3f(0.0031308000907301903)));
+        return select((12.92f * linear), ((1.055f * pow(linear, vec3f(0.4166666567325592))) - vec3f(0.054999999701976776)), (linear > vec3f(0.0031308000907301903)));
       }
 
       struct fragmentFunction_Input {
@@ -134,12 +134,12 @@ describe('box raytracing example', () => {
 
       @fragment fn fragmentFunction(input: fragmentFunction_Input) -> @location(0) vec4f {
         var boxSize3 = vec3f(uniforms.boxSize);
-        var halfBoxSize3 = (0.5 * boxSize3);
-        var halfCanvasDims = (0.5 * uniforms.canvasDims);
+        var halfBoxSize3 = (0.5f * boxSize3);
+        var halfCanvasDims = (0.5f * uniforms.canvasDims);
         let minDim = min(uniforms.canvasDims.x, uniforms.canvasDims.y);
         var viewCoords = ((input.position.xy - halfCanvasDims) / minDim);
         var ray = Ray(input.rayWorldOrigin, (uniforms.invViewMatrix * vec4f(normalize(vec3f(viewCoords, 1f)), 0f)).xyz);
-        var bigBoxIntersection = getBoxIntersection(AxisAlignedBounds((-1 * halfBoxSize3), (vec3f(7) + halfBoxSize3)), ray);
+        var bigBoxIntersection = getBoxIntersection(AxisAlignedBounds((-1f * halfBoxSize3), (vec3f(7) + halfBoxSize3)), ray);
         if (!bigBoxIntersection.intersects) {
           discard;;
           return vec4f();

packages/typegpu/tests/examples/individual/camera-thresholding.test.ts

@@ -50,7 +50,7 @@ describe('camera thresholding example', () => {
       }
 
       @fragment fn mainFrag(input: mainFrag_Input) -> @location(0) vec4f {
-        var uv2 = ((uvTransformUniform * (input.uv - 0.5)) + 0.5);
+        var uv2 = ((uvTransformUniform * (input.uv - 0.5f)) + 0.5f);
         var col = textureSampleBaseClampToEdge(inputTexture, sampler_1, uv2);
         var ycbcr = (col.xyz * rgbToYcbcrMatrix);
         var colycbcr = (colorUniform * rgbToYcbcrMatrix);

packages/typegpu/tests/examples/individual/caustics.test.ts

@@ -36,7 +36,7 @@ describe('caustics example', () => {
 
       fn tilePattern(uv: vec2f) -> f32 {
         var tiledUv = fract(uv);
-        var proximity = abs(((tiledUv * 2) - 1));
+        var proximity = abs(((tiledUv * 2f) - 1f));
         let maxProximity = max(proximity.x, proximity.y);
         return saturate((pow((1f - maxProximity), 0.6f) * 5f));
       }
@@ -73,7 +73,7 @@ describe('caustics example', () => {
       }
 
       fn computeJunctionGradient(pos: vec3i) -> vec3f {
-        randSeed3((1e-3 * vec3f(pos)));
+        randSeed3((1e-3f * vec3f(pos)));
         return randOnUnitSphere();
       }
 
@@ -84,7 +84,7 @@ describe('caustics example', () => {
       }
 
       fn quinticInterpolationImpl(t: vec3f) -> vec3f {
-        return ((t * (t * t)) * ((t * ((t * 6) - 15)) + 10));
+        return ((t * (t * t)) * ((t * ((t * 6f) - 15f)) + 10f));
       }
 
       fn sample(pos: vec3f) -> f32 {
@@ -109,9 +109,9 @@ describe('caustics example', () => {
       }
 
       fn caustics(uv: vec2f, time2: f32, profile: vec3f) -> vec3f {
-        let distortion = sample(vec3f((uv * 0.5), (time2 * 0.2f)));
+        let distortion = sample(vec3f((uv * 0.5f), (time2 * 0.2f)));
         var uv2 = (uv + distortion);
-        let noise = abs(sample(vec3f((uv2 * 5), time2)));
+        let noise = abs(sample(vec3f((uv2 * 5f), time2)));
         return pow(vec3f((1f - noise)), profile);
       }
 
@@ -130,15 +130,15 @@ describe('caustics example', () => {
         var albedo = mix(vec3f(0.10000000149011612), vec3f(1), tile);
         var cuv = vec2f(((_arg_0.uv.x * (pow((_arg_0.uv.y * 1.5f), 3f) + 0.1f)) * 5f), (pow((((_arg_0.uv.y * 1.5f) + 0.1f) * 1.5f), 3f) * 1f));
         var c1 = (caustics(cuv, (time * 0.2f), vec3f(4, 4, 1)) * vec3f(0.4000000059604645, 0.6499999761581421, 1));
-        var c2 = (caustics((cuv * 2), (time * 0.4f), vec3f(16, 1, 4)) * vec3f(0.18000000715255737, 0.30000001192092896, 0.5));
+        var c2 = (caustics((cuv * 2f), (time * 0.4f), vec3f(16, 1, 4)) * vec3f(0.18000000715255737, 0.30000001192092896, 0.5));
         var blendCoord = vec3f((_arg_0.uv * vec2f(5, 10)), ((time * 0.2f) + 5f));
         let blend = saturate((sample(blendCoord) + 0.3f));
         var noFogColor = (albedo * mix(vec3f(0.20000000298023224, 0.5, 1), (c1 + c2), blend));
         let fog = min((pow(_arg_0.uv.y, 0.5f) * 1.2f), 1f);
         var godRayUv = ((rotateXY(-0.3f) * _arg_0.uv) * vec2f(15, 3));
         let godRayFactor = pow(_arg_0.uv.y, 1f);
         var godRay1 = ((sample(vec3f(godRayUv, (time * 0.5f))) + 1f) * (vec3f(0.18000000715255737, 0.30000001192092896, 0.5) * godRayFactor));
-        var godRay2 = ((sample(vec3f((godRayUv * 2), (time * 0.3f))) + 1f) * (vec3f(0.18000000715255737, 0.30000001192092896, 0.5) * (godRayFactor * 0.4f)));
+        var godRay2 = ((sample(vec3f((godRayUv * 2f), (time * 0.3f))) + 1f) * (vec3f(0.18000000715255737, 0.30000001192092896, 0.5) * (godRayFactor * 0.4f)));
         var godRays = (godRay1 + godRay2);
         return vec4f((mix(noFogColor, vec3f(0.05000000074505806, 0.20000000298023224, 0.699999988079071), fog) + godRays), 1f);
       }"

packages/typegpu/tests/examples/individual/chroma-keying.test.ts

@@ -50,7 +50,7 @@ describe('chroma keying example', () => {
       }
 
       @fragment fn fragment(_arg_0: fragment_Input) -> @location(0) vec4f {
-        var uv2 = ((uvTransform * (_arg_0.uv - 0.5)) + 0.5);
+        var uv2 = ((uvTransform * (_arg_0.uv - 0.5f)) + 0.5f);
         var col = textureSampleBaseClampToEdge(inputTexture, sampler_1, uv2);
         var ycbcr = (col.xyz * rgbToYcbcrMatrix);
         var colycbcr = (color * rgbToYcbcrMatrix);