Add a % for Operand::IdRef Display impl

autogen/src/dr.rs

@@ -285,6 +285,11 @@ pub fn gen_dr_operand_kinds(grammar: &[structs::OperandKind]) -> TokenStream {
                 quote! {
                     Operand::#element(ref v) => write!(f, "{}", &format!("{:?}", v)[3..])
                 }
+            } else if element == "IdRef" || element == "IdScope" || element == "IdMemorySemantics" {
+                // Prefix operands with a % so they're distinguishable from e.g. integer arguments.
+                quote! {
+                    Operand::#element(ref v) => write!(f, "%{}", v)
+                }
             } else {
                 quote! {
                     Operand::#element(ref v) => write!(f, "{:?}", v)

rspirv/dr/autogen_operand.rs

@@ -93,9 +93,9 @@ impl fmt::Display for Operand {
             Operand::RayQueryIntersection(ref v) => write!(f, "{:?}", v),
             Operand::RayQueryCommittedIntersectionType(ref v) => write!(f, "{:?}", v),
             Operand::RayQueryCandidateIntersectionType(ref v) => write!(f, "{:?}", v),
-            Operand::IdMemorySemantics(ref v) => write!(f, "{:?}", v),
-            Operand::IdScope(ref v) => write!(f, "{:?}", v),
-            Operand::IdRef(ref v) => write!(f, "{:?}", v),
+            Operand::IdMemorySemantics(ref v) => write!(f, "%{}", v),
+            Operand::IdScope(ref v) => write!(f, "%{}", v),
+            Operand::IdRef(ref v) => write!(f, "%{}", v),
             Operand::LiteralString(ref v) => write!(f, "{:?}", v),
             Operand::LiteralExtInstInteger(ref v) => write!(f, "{:?}", v),
             Operand::LiteralSpecConstantOpInteger(ref v) => write!(f, "{:?}", v),

rspirv/dr/constructs.rs

@@ -374,4 +374,17 @@ mod tests {
             dr::Operand::from(spirv::Op::IAdd)
         );
     }
+
+    #[test]
+    fn test_operand_display() {
+        assert_eq!(
+            format!(
+                "{}",
+                dr::Operand::FunctionControl(spirv::FunctionControl::INLINE)
+            ),
+            "INLINE",
+        );
+        assert_eq!(format!("{}", dr::Operand::IdRef(3)), "%3");
+        assert_eq!(format!("{}", dr::Operand::LiteralInt32(3)), "3");
+    }
 }