diff --git a/renderdoc/api/replay/gl_pipestate.h b/renderdoc/api/replay/gl_pipestate.h
index f080aaf93..eb2b44c83 100644
--- a/renderdoc/api/replay/gl_pipestate.h
+++ b/renderdoc/api/replay/gl_pipestate.h
@@ -73,6 +73,9 @@ struct GLPipelineState
 		ResourceId Resource;
 		uint32_t FirstSlice;
 		ShaderResourceType ResType;
+
+		TextureSwizzle Swizzle[4];
+		int32_t DepthReadChannel;
 	};
 	rdctype::array<Texture> Textures;
 	
diff --git a/renderdoc/api/replay/replay_enums.h b/renderdoc/api/replay/replay_enums.h
index 678e2850f..9b251061f 100644
--- a/renderdoc/api/replay/replay_enums.h
+++ b/renderdoc/api/replay/replay_enums.h
@@ -46,6 +46,16 @@ enum FormatComponentType
 	eCompType_Double,
 };
 
+enum TextureSwizzle
+{
+	eSwizzle_Red,
+	eSwizzle_Green,
+	eSwizzle_Blue,
+	eSwizzle_Alpha,
+	eSwizzle_Zero,
+	eSwizzle_One,
+};
+
 enum ShaderResourceType
 {
 	eResType_None,
diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp
index fcbd4d877..075563691 100644
--- a/renderdoc/driver/gl/gl_replay.cpp
+++ b/renderdoc/driver/gl/gl_replay.cpp
@@ -1259,7 +1259,53 @@ void GLReplay::SavePipelineState()
 			pipe.Textures[unit].Resource = rm->GetOriginalID(rm->GetID(TextureRes(ctx, tex)));
 			pipe.Textures[unit].FirstSlice = (uint32_t)firstSlice;
 			pipe.Textures[unit].ResType = resType;
-			
+
+			pipe.Textures[unit].DepthReadChannel = -1;
+
+			GLenum levelQueryType = target == eGL_TEXTURE_CUBE_MAP ? eGL_TEXTURE_CUBE_MAP_POSITIVE_X : target;
+			GLenum fmt = eGL_NONE;
+			gl.glGetTexLevelParameteriv(levelQueryType, 0, eGL_TEXTURE_INTERNAL_FORMAT, (GLint *)&fmt);
+			if(IsDepthStencilFormat(fmt))
+			{
+				GLint depthMode;
+				gl.glGetTexParameteriv(target, eGL_DEPTH_STENCIL_TEXTURE_MODE, &depthMode);
+
+				if(depthMode == eGL_DEPTH_COMPONENT)
+					pipe.Textures[unit].DepthReadChannel = 0;
+				else if(depthMode == eGL_STENCIL_INDEX)
+					pipe.Textures[unit].DepthReadChannel = 1;
+			}
+
+			GLint swizzles[4] = { eGL_RED, eGL_GREEN, eGL_BLUE, eGL_ALPHA };
+			if(target != eGL_TEXTURE_BUFFER)
+				gl.glGetTexParameteriv(target, eGL_TEXTURE_SWIZZLE_RGBA, swizzles);
+
+			for(int i=0; i < 4; i++)
+			{
+				switch(swizzles[i])
+				{
+					default:
+					case GL_ZERO:
+						pipe.Textures[unit].Swizzle[i] = eSwizzle_Zero;
+						break;
+					case GL_ONE:
+						pipe.Textures[unit].Swizzle[i] = eSwizzle_One;
+						break;
+					case eGL_RED:
+						pipe.Textures[unit].Swizzle[i] = eSwizzle_Red;
+						break;
+					case eGL_GREEN:
+						pipe.Textures[unit].Swizzle[i] = eSwizzle_Green;
+						break;
+					case eGL_BLUE:
+						pipe.Textures[unit].Swizzle[i] = eSwizzle_Blue;
+						break;
+					case eGL_ALPHA:
+						pipe.Textures[unit].Swizzle[i] = eSwizzle_Alpha;
+						break;
+				}
+			}
+
 			GLuint samp;
 			gl.glGetIntegerv(eGL_SAMPLER_BINDING, (GLint *)&samp);
 
diff --git a/renderdocui/Interop/Enums.cs b/renderdocui/Interop/Enums.cs
index 08e8a4442..56f6a0506 100644
--- a/renderdocui/Interop/Enums.cs
+++ b/renderdocui/Interop/Enums.cs
@@ -48,6 +48,16 @@ namespace renderdoc
         Double,
     };
 
+    public enum TextureSwizzle
+    {
+        Red,
+        Green,
+        Blue,
+        Alpha,
+        Zero,
+        One,
+    };
+
     public enum ShaderResourceType
     {
         None,
@@ -434,6 +444,21 @@ namespace renderdoc
             return "Unknown Type";
         }
 
+        public static string Str(this TextureSwizzle swiz)
+        {
+            switch (swiz)
+            {
+                case TextureSwizzle.Red: return "R";
+                case TextureSwizzle.Green: return "G";
+                case TextureSwizzle.Blue: return "B";
+                case TextureSwizzle.Alpha: return "A";
+                case TextureSwizzle.Zero: return "0";
+                case TextureSwizzle.One: return "1";
+            }
+
+            return "Unknown";
+        }
+
         public static string Str(this ReplayCreateStatus status)
         {
             switch (status)
diff --git a/renderdocui/Interop/GLPipelineState.cs b/renderdocui/Interop/GLPipelineState.cs
index c6b69bc62..13df81204 100644
--- a/renderdocui/Interop/GLPipelineState.cs
+++ b/renderdocui/Interop/GLPipelineState.cs
@@ -96,6 +96,9 @@ namespace renderdoc
             public ResourceId Resource;
             public UInt32 FirstSlice;
             public ShaderResourceType ResType;
+            [CustomMarshalAs(CustomUnmanagedType.FixedArray, FixedLength = 4)]
+            public TextureSwizzle[] Swizzle;
+            public Int32 DepthReadChannel;
         };
         [CustomMarshalAs(CustomUnmanagedType.TemplatedArray)]
         public Texture[] Textures;
diff --git a/renderdocui/Windows/PipelineState/GLPipelineStateViewer.cs b/renderdocui/Windows/PipelineState/GLPipelineStateViewer.cs
index 05c9b6ee0..0ec625073 100644
--- a/renderdocui/Windows/PipelineState/GLPipelineStateViewer.cs
+++ b/renderdocui/Windows/PipelineState/GLPipelineStateViewer.cs
@@ -265,6 +265,29 @@ namespace renderdocui.Windows.PipelineState
                                     name = texs[t].name;
                                     typename = texs[t].resType.ToString();
 
+                                    if (texs[t].format.special &&
+                                        (texs[t].format.specialFormat == SpecialFormat.D24S8 ||
+                                         texs[t].format.specialFormat == SpecialFormat.D32S8)
+                                        )
+                                    {
+                                        if (r.DepthReadChannel == 0)
+                                            format += " Depth-Read";
+                                        else if (r.DepthReadChannel == 1)
+                                            format += " Stencil-Read";
+                                    }
+                                    else if (
+                                        r.Swizzle[0] != TextureSwizzle.Red ||
+                                        r.Swizzle[1] != TextureSwizzle.Green ||
+                                        r.Swizzle[2] != TextureSwizzle.Blue ||
+                                        r.Swizzle[3] != TextureSwizzle.Alpha)
+                                    {
+                                        format += String.Format(" swizzle[{0}{1}{2}{3}]",
+                                            r.Swizzle[0].Str(),
+                                            r.Swizzle[1].Str(),
+                                            r.Swizzle[2].Str(),
+                                            r.Swizzle[3].Str());
+                                    }
+
                                     tag = texs[t];
                                 }
                             }