diff --git a/renderdoc/driver/gl/gl_resources.cpp b/renderdoc/driver/gl/gl_resources.cpp
index 8c2e05cd2..f7d216aaf 100644
--- a/renderdoc/driver/gl/gl_resources.cpp
+++ b/renderdoc/driver/gl/gl_resources.cpp
@@ -25,6 +25,10 @@
 #include "gl_hookset.h"
 #include "gl_resources.h"
 
+// no longer in glcorearb.h or glext.h
+const GLenum eGL_LUMINANCE = (GLenum)0x1909;
+const GLenum eGL_LUMINANCE_ALPHA = (GLenum)0x190A;
+
 size_t GetByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum format, GLenum type, int align)
 {
 	size_t elemSize = 0;
@@ -103,7 +107,7 @@ size_t GetByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum format, GLenum type,
 			break;
 	}
 
-	switch(format)
+	switch((int)format)
 	{
 		case eGL_RED:
 		case eGL_RED_INTEGER:
@@ -111,11 +115,13 @@ size_t GetByteSize(GLsizei w, GLsizei h, GLsizei d, GLenum format, GLenum type,
 		case eGL_GREEN_INTEGER:
 		case eGL_BLUE:
 		case eGL_BLUE_INTEGER:
+		case eGL_LUMINANCE:
 		case eGL_DEPTH_COMPONENT:
 		case eGL_STENCIL_INDEX:
 			return ((w*elemSize + alignAdd) & alignMask)*h*d;
 		case eGL_RG:
 		case eGL_RG_INTEGER:
+		case eGL_LUMINANCE_ALPHA:
 		case eGL_DEPTH_STENCIL:
 			return ((w*elemSize*2 + alignAdd) & alignMask)*h*d;
 		case eGL_RGB:
@@ -456,6 +462,72 @@ GLenum GetSizedFormat(const GLHookSet &gl, GLenum target, GLenum internalFormat)
 	return internalFormat;
 }
 
+void EmulateLuminanceFormat(const GLHookSet &gl, GLuint tex, GLenum target, GLenum &internalFormat, GLenum &dataFormat)
+{
+	GLenum swizzle[] = { eGL_RED, eGL_GREEN, eGL_BLUE, eGL_ALPHA };
+
+	bool dataFormatLum = (dataFormat == eGL_LUMINANCE || dataFormat == eGL_LUMINANCE_ALPHA);
+
+	switch((int)internalFormat)
+	{
+		case eGL_LUMINANCE:
+		case eGL_LUMINANCE8_EXT:
+			internalFormat = eGL_R8;
+			if(dataFormatLum) dataFormat = eGL_RED;
+			swizzle[0] = swizzle[1] = swizzle[2] = eGL_RED;
+			break;
+		case eGL_SLUMINANCE8_EXT:
+			internalFormat = eGL_SRGB8;
+			if(dataFormatLum) dataFormat = eGL_RED;
+			swizzle[0] = swizzle[1] = swizzle[2] = eGL_RED;
+			break;
+		case eGL_LUMINANCE16_EXT:
+			internalFormat = eGL_R16;
+			if(dataFormatLum) dataFormat = eGL_RED;
+			swizzle[0] = swizzle[1] = swizzle[2] = eGL_RED;
+			break;
+		case eGL_LUMINANCE32F_ARB:
+			internalFormat = eGL_R32F;
+			if(dataFormatLum) dataFormat = eGL_RED;
+			swizzle[0] = swizzle[1] = swizzle[2] = eGL_RED;
+			break;
+		case eGL_LUMINANCE32I_EXT:
+			internalFormat = eGL_R32I;
+			if(dataFormatLum) dataFormat = eGL_RED;
+			swizzle[0] = swizzle[1] = swizzle[2] = eGL_RED;
+			break;
+		case eGL_LUMINANCE32UI_EXT:
+			internalFormat = eGL_R32UI;
+			if(dataFormatLum) dataFormat = eGL_RED;
+			swizzle[0] = swizzle[1] = swizzle[2] = eGL_RED;
+			break;
+		case eGL_LUMINANCE_ALPHA:
+		case eGL_LUMINANCE8_ALPHA8_EXT:
+			internalFormat = eGL_RG8;
+			if(dataFormatLum) dataFormat = eGL_RG;
+			swizzle[0] = swizzle[1] = swizzle[2] = eGL_RED;
+			swizzle[3] = eGL_GREEN;
+			break;
+		case eGL_SLUMINANCE8_ALPHA8_EXT:
+			internalFormat = eGL_SRGB8_ALPHA8;
+			if(dataFormatLum) dataFormat = eGL_RG;
+			swizzle[0] = swizzle[1] = swizzle[2] = eGL_RED;
+			swizzle[3] = eGL_GREEN;
+			break;
+		case eGL_LUMINANCE16_ALPHA16_EXT:
+			internalFormat = eGL_RG16;
+			if(dataFormatLum) dataFormat = eGL_RG;
+			swizzle[0] = swizzle[1] = swizzle[2] = eGL_RED;
+			swizzle[3] = eGL_GREEN;
+			break;
+		default:
+			return;
+	}
+
+	if(tex)
+		gl.glTextureParameterivEXT(tex, target, eGL_TEXTURE_SWIZZLE_RGBA, (GLint *)swizzle);
+}
+
 bool IsCompressedFormat(GLenum internalFormat)
 {
 	switch(internalFormat)
diff --git a/renderdoc/driver/gl/gl_resources.h b/renderdoc/driver/gl/gl_resources.h
index 8e0e545d0..1f4400f88 100644
--- a/renderdoc/driver/gl/gl_resources.h
+++ b/renderdoc/driver/gl/gl_resources.h
@@ -36,6 +36,8 @@ GLenum GetBaseFormat(GLenum internalFormat);
 GLenum GetDataType(GLenum internalFormat);
 GLenum GetSizedFormat(const GLHookSet &gl, GLenum target, GLenum internalFormat);
 
+void EmulateLuminanceFormat(const GLHookSet &gl, GLuint tex, GLenum target, GLenum &internalFormat, GLenum &dataFormat);
+
 int GetNumMips(const GLHookSet &gl, GLenum target, GLuint tex, GLuint w, GLuint h, GLuint d);
 
 bool IsCompressedFormat(GLenum internalFormat);
diff --git a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp
index ca228f78e..760a28dc0 100644
--- a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp
+++ b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp
@@ -1696,6 +1696,8 @@ bool WrappedOpenGL::Serialise_glTextureImage1DEXT(GLuint texture, GLenum target,
 	
 	if(m_State == READING)
 	{
+		EmulateLuminanceFormat(m_Real, GetResourceManager()->GetLiveResource(id).name, Target, IntFormat, Format);
+
 		if(Level == 0) // assume level 0 will always get a glTexImage call
 		{
 			ResourceId liveId = GetResourceManager()->GetLiveID(id);
@@ -1929,6 +1931,8 @@ bool WrappedOpenGL::Serialise_glTextureImage2DEXT(GLuint texture, GLenum target,
 	
 	if(m_State == READING)
 	{
+		EmulateLuminanceFormat(m_Real, GetResourceManager()->GetLiveResource(id).name, Target, IntFormat, Format);
+
 		if(Level == 0) // assume level 0 will always get a glTexImage call
 		{
 			ResourceId liveId = GetResourceManager()->GetLiveID(id);
@@ -2169,6 +2173,8 @@ bool WrappedOpenGL::Serialise_glTextureImage3DEXT(GLuint texture, GLenum target,
 	
 	if(m_State == READING)
 	{
+		EmulateLuminanceFormat(m_Real, GetResourceManager()->GetLiveResource(id).name, Target, IntFormat, Format);
+
 		if(Level == 0) // assume level 0 will always get a glTexImage call
 		{
 			ResourceId liveId = GetResourceManager()->GetLiveID(id);