diff --git a/renderdoc/Makefile b/renderdoc/Makefile
index 885df44e5..1cfc67144 100644
--- a/renderdoc/Makefile
+++ b/renderdoc/Makefile
@@ -56,7 +56,8 @@ os/linux/linux_process.o \
 os/linux/linux_stringio.o \
 os/linux/linux_threading.o \
 hooks/linux_libentry.o
-DATA=data/glsl/blit.frago \
+DATA=data/glsl/debuguniforms.ho \
+data/glsl/blit.frago \
 data/glsl/blit.verto \
 data/glsl/texdisplay.frago \
 data/glsl/checkerboard.frago \
@@ -97,6 +98,11 @@ $(OBJDIR)/%.ttfo: %.ttf
 	cd $$(dirname $<) && objcopy --input binary --output elf64-x86-64 --binary-architecture i386 $$(basename $<) $$(basename $@)
 	@mv $$(dirname $<)/$$(basename $@) $@
 
+$(OBJDIR)/%.ho: %.h
+	@mkdir -p $$(dirname $@)
+	cd $$(dirname $<) && objcopy --input binary --output elf64-x86-64 --binary-architecture i386 $$(basename $<) $$(basename $@)
+	@mv $$(dirname $<)/$$(basename $@) $@
+
 OBJDIR_OBJECTS=$(addprefix $(OBJDIR)/, $(OBJECTS))
 OBJDIR_DATA=$(addprefix $(OBJDIR)/, $(DATA))
 
diff --git a/renderdoc/data/embedded_files.h b/renderdoc/data/embedded_files.h
index 3dfc090bf..680ffa5da 100644
--- a/renderdoc/data/embedded_files.h
+++ b/renderdoc/data/embedded_files.h
@@ -28,6 +28,7 @@
 	extern char CONCAT( CONCAT(_binary_, filename) , _start) ; \
 	extern char CONCAT( CONCAT(_binary_, filename) , _end) ;
 
+DECLARE_EMBED(debuguniforms_h);
 DECLARE_EMBED(blit_vert);
 DECLARE_EMBED(blit_frag);
 DECLARE_EMBED(texdisplay_frag);
diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp
index 81a8d6cdc..ea89f91f1 100644
--- a/renderdoc/driver/gl/gl_debug.cpp
+++ b/renderdoc/driver/gl/gl_debug.cpp
@@ -273,22 +273,22 @@ bool GLReplay::RenderTexture(TextureDisplay cfg)
 			float rangeScale;
 			switch (tex.format.rawType)
 			{
-			case eGL_STENCIL_INDEX1:
-				rangeScale = 1.0f;
-				break;
-			case eGL_STENCIL_INDEX4:
-				rangeScale = 16.0f;
-				break;
-			default:
-				RDCWARN("Unexpected raw format for stencil visualization");
-			case eGL_DEPTH24_STENCIL8:
-			case eGL_DEPTH32F_STENCIL8:
-			case eGL_STENCIL_INDEX8:
-				rangeScale = 256.0f;
-				break;
-			case eGL_STENCIL_INDEX16:
-				rangeScale = 65536.0f;
-				break;
+				case eGL_STENCIL_INDEX1:
+					rangeScale = 1.0f;
+					break;
+				case eGL_STENCIL_INDEX4:
+					rangeScale = 16.0f;
+					break;
+				default:
+					RDCWARN("Unexpected raw format for stencil visualization");
+				case eGL_DEPTH24_STENCIL8:
+				case eGL_DEPTH32F_STENCIL8:
+				case eGL_STENCIL_INDEX8:
+					rangeScale = 256.0f;
+					break;
+				case eGL_STENCIL_INDEX16:
+					rangeScale = 65536.0f;
+					break;
 			}
 			cfg.rangemin *= rangeScale;
 			cfg.rangemax *= rangeScale;
@@ -300,12 +300,14 @@ bool GLReplay::RenderTexture(TextureDisplay cfg)
 	{
 		switch (tex.format.compType)
 		{
-		case eCompType_UInt:
-			resType |= TEXDISPLAY_UINT_TEX;
-			break;
-		case eCompType_SNorm:
-			resType |= TEXDISPLAY_SINT_TEX;
-			break;
+			case eCompType_UInt:
+				resType |= TEXDISPLAY_UINT_TEX;
+				break;
+			case eCompType_SNorm:
+				resType |= TEXDISPLAY_SINT_TEX;
+				break;
+			default:
+				break;
 		}
 	}