diff --git a/renderdoc/api/replay/gl_pipestate.h b/renderdoc/api/replay/gl_pipestate.h
index ef56d44ac..e9d5f4186 100644
--- a/renderdoc/api/replay/gl_pipestate.h
+++ b/renderdoc/api/replay/gl_pipestate.h
@@ -148,9 +148,9 @@ struct GLPipelineState
 	rdctype::array<Buffer> UniformBuffers;
 	rdctype::array<Buffer> ShaderStorageBuffers;
 	
-	struct Image
+	struct ImageLoadStore
 	{
-		Image()
+		ImageLoadStore()
 			: Resource(), Level(0), Layered(false), Layer(0),
 			  ResType(eResType_None), readAllowed(false), writeAllowed(false)
 		{
@@ -164,7 +164,7 @@ struct GLPipelineState
 		bool32 writeAllowed;
 		ResourceFormat Format;
 	};
-	rdctype::array<Image> Images;
+	rdctype::array<ImageLoadStore> Images;
 	
 	struct Feedback
 	{
diff --git a/renderdocui/Interop/GLPipelineState.cs b/renderdocui/Interop/GLPipelineState.cs
index ac905862c..a23587478 100644
--- a/renderdocui/Interop/GLPipelineState.cs
+++ b/renderdocui/Interop/GLPipelineState.cs
@@ -159,7 +159,26 @@ namespace renderdoc
             public UInt64 Size;
         };
         [CustomMarshalAs(CustomUnmanagedType.TemplatedArray)]
+        public Buffer[] AtomicBuffers;
+        [CustomMarshalAs(CustomUnmanagedType.TemplatedArray)]
         public Buffer[] UniformBuffers;
+        [CustomMarshalAs(CustomUnmanagedType.TemplatedArray)]
+        public Buffer[] ShaderStorageBuffers;
+
+        [StructLayout(LayoutKind.Sequential)]
+        public class ImageLoadStore
+        {
+            public ResourceId Resource;
+            public UInt32 Level;
+            public bool Layered;
+            public UInt32 Layer;
+            public ShaderResourceType ResType;
+            public bool readAllowed;
+            public bool writeAllowed;
+            public ResourceFormat Format;
+        };
+        [CustomMarshalAs(CustomUnmanagedType.TemplatedArray)]
+        public ImageLoadStore[] Images;
 
         [StructLayout(LayoutKind.Sequential)]
         public class Feedback