diff -urN apitrace-9.0-orig/retrace/glstate_shaders.cpp apitrace-9.0/retrace/glstate_shaders.cpp
--- apitrace-9.0-orig/retrace/glstate_shaders.cpp	2019-11-26 23:27:11 +0900
+++ apitrace-9.0/retrace/glstate_shaders.cpp	2020-08-25 22:02:37 +0900
@@ -1221,8 +1221,16 @@
         } else {
             dumpVertexAttributes(writer, context, program);
         }
-        if (program) {
-            dumpTransformFeedback(writer, program);
+        if (pipeline) {
+            if (geometry_program) {
+                dumpTransformFeedback(writer, geometry_program);
+            } else if (vertex_program) {
+                dumpTransformFeedback(writer, vertex_program);
+            }
+        } else {
+            if (program) {
+                dumpTransformFeedback(writer, program);
+            }
         }
     }
     writer.endObject();
