Revert questionable change to bitcast.

HansKristian-Work · HansKristian-Work · commit 7594d2b40ab9 · 2026-03-13T11:25:38.000+01:00
diff --git a/reference/opt/shaders-msl/comp/buffer_device_address-packed-vec-and-cast-to-and-from-uvec2.msl23.comp b/reference/opt/shaders-msl/comp/buffer_device_address-packed-vec-and-cast-to-and-from-uvec2.msl23.comp
@@ -19,7 +19,7 @@ struct SSBO
 kernel void main0(constant UBO& _10 [[buffer(0)]])
 {
     (reinterpret_cast<device SSBO*>(as_type<ulong>(_10.b)))->a1 = float3(1.0, 2.0, 3.0);
-    device SSBO* _39 = reinterpret_cast<device SSBO*>(as_type<ulong>(as_type<uint2>(reinterpret_cast<ulong>((reinterpret_cast<device SSBO*>(as_type<ulong>(_10.b + uint2(32u))))))));
+    device SSBO* _39 = reinterpret_cast<device SSBO*>(as_type<ulong>(as_type<uint2>(reinterpret_cast<ulong>(reinterpret_cast<device SSBO*>(as_type<ulong>(_10.b + uint2(32u)))))));
     _39->a1 = float3(_39->a1) + float3(1.0);
 }
 
diff --git a/reference/shaders-msl/comp/buffer_device_address-packed-vec-and-cast-to-and-from-uvec2.msl23.comp b/reference/shaders-msl/comp/buffer_device_address-packed-vec-and-cast-to-and-from-uvec2.msl23.comp
@@ -19,7 +19,7 @@ struct SSBO
 kernel void main0(constant UBO& _10 [[buffer(0)]])
 {
     (reinterpret_cast<device SSBO*>(as_type<ulong>(_10.b)))->a1 = float3(1.0, 2.0, 3.0);
-    uint2 v2 = as_type<uint2>(reinterpret_cast<ulong>((reinterpret_cast<device SSBO*>(as_type<ulong>(_10.b + uint2(32u))))));
+    uint2 v2 = as_type<uint2>(reinterpret_cast<ulong>(reinterpret_cast<device SSBO*>(as_type<ulong>(_10.b + uint2(32u)))));
     float3 v3 = float3((reinterpret_cast<device SSBO*>(as_type<ulong>(v2)))->a1);
     (reinterpret_cast<device SSBO*>(as_type<ulong>(v2)))->a1 = v3 + float3(1.0);
 }
diff --git a/spirv_msl.cpp b/spirv_msl.cpp
@@ -10529,7 +10529,7 @@ void CompilerMSL::emit_instruction(const Instruction &instruction)
 		if (opcode != OpBitcast || is_pointer(type) || is_pointer(input_type))
 		{
 			string op;
-			auto input_expr = is_pointer(input_type) ? to_ptr_expression(ops[2]) : to_unpacked_expression(ops[2]);
+			auto input_expr = to_unpacked_expression(ops[2]);
 
 			if ((type.vecsize == 1 || is_pointer(type)) && (input_type.vecsize == 1 || is_pointer(input_type)))
 				op = join("reinterpret_cast<", type_to_glsl(type), ">(", input_expr, ")");

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ struct SSBO`
`19`	`19`	`kernel void main0(constant UBO& _10 [[buffer(0)]])`
`20`	`20`	`{`
`21`	`21`	`(reinterpret_cast<device SSBO*>(as_type<ulong>(_10.b)))->a1 = float3(1.0, 2.0, 3.0);`
`22`		`- device SSBO* _39 = reinterpret_cast<device SSBO>(as_type<ulong>(as_type<uint2>(reinterpret_cast<ulong>((reinterpret_cast<device SSBO>(as_type<ulong>(_10.b + uint2(32u))))))));`
	`22`	`+ device SSBO* _39 = reinterpret_cast<device SSBO>(as_type<ulong>(as_type<uint2>(reinterpret_cast<ulong>(reinterpret_cast<device SSBO>(as_type<ulong>(_10.b + uint2(32u)))))));`
`23`	`23`	`_39->a1 = float3(_39->a1) + float3(1.0);`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -10529,7 +10529,7 @@ void CompilerMSL::emit_instruction(const Instruction &instruction)`
`10529`	`10529`	`if (opcode != OpBitcast \|\| is_pointer(type) \|\| is_pointer(input_type))`
`10530`	`10530`	`{`
`10531`	`10531`	`string op;`
`10532`		`- auto input_expr = is_pointer(input_type) ? to_ptr_expression(ops[2]) : to_unpacked_expression(ops[2]);`
	`10532`	`+ auto input_expr = to_unpacked_expression(ops[2]);`
`10533`	`10533`
`10534`	`10534`	`if ((type.vecsize == 1 \|\| is_pointer(type)) && (input_type.vecsize == 1 \|\| is_pointer(input_type)))`
`10535`	`10535`	`op = join("reinterpret_cast<", type_to_glsl(type), ">(", input_expr, ")");`