diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml
index e8b2b89b18e..220e85b40d6 100644
--- a/src/asahi/lib/cmdbuf.xml
+++ b/src/asahi/lib/cmdbuf.xml
@@ -383,22 +383,25 @@
     <field name="Tag" size="8" start="0:0" type="hex" default="0x1d"/>
     <field name="Start (halfs)" size="8" start="0:8" type="uint"/>
     <field name="Unk" size="4" start="0:16" type="hex" default="0x0"/>
-    <field name="Size (halfs)" size="4" start="0:20" type="uint"/>
-    <field name="Buffer" size="40" start="0:24" type="address"/>
+    <!-- Exact split is unknown. -->
+    <field name="Size (halfs)" size="8" start="0:20" type="uint"/>
+    <field name="Buffer" size="36" start="0:28" type="address" modifier="shr(4)"/>
   </struct>
 
   <struct name="Bind texture" size="8">
     <field name="Tag" size="8" start="0:0" type="hex" default="0xdd"/>
     <field name="Start" size="8" start="0:8" type="uint"/>
-    <field name="Count" size="4" start="0:20" type="uint"/>
-    <field name="Buffer" size="40" start="0:24" type="address"/>
+    <!-- Exact split is unknown. Count is at least 5 bits. -->
+    <field name="Count" size="8" start="0:20" type="uint"/>
+    <field name="Buffer" size="36" start="0:28" type="address" modifier="shr(4)"/>
   </struct>
 
   <struct name="Bind sampler" size="8">
     <field name="Tag" size="8" start="0:0" type="hex" default="0x9d"/>
     <field name="Start" size="8" start="0:8" type="uint"/>
-    <field name="Count" size="4" start="0:20" type="uint"/>
-    <field name="Buffer" size="40" start="0:24" type="address"/>
+    <field name="Count" size="8" start="0:20" type="uint"/>
+    <!-- Exact split is unknown. -->
+    <field name="Buffer" size="36" start="0:28" type="address" modifier="shr(4)"/>
   </struct>
 
   <enum name="Preshader mode">