diff --git a/renderdoc/data/spv/debuguniforms.h b/renderdoc/data/spv/debuguniforms.h
index bbdf2b48d..0b4419a19 100644
--- a/renderdoc/data/spv/debuguniforms.h
+++ b/renderdoc/data/spv/debuguniforms.h
@@ -159,9 +159,8 @@ BINDING (0, 0) uniform TexDisplayUBOData
 #define RESTYPE_TEX1D          0x1
 #define RESTYPE_TEX2D          0x2
 #define RESTYPE_TEX3D          0x3
-#define RESTYPE_TEXBUFFER      0x4
-#define RESTYPE_TEX2DMS        0x5
-#define RESTYPE_TEXTYPEMAX     0x6
+#define RESTYPE_TEX2DMS        0x4
+#define RESTYPE_TEXTYPEMAX     0x5
 
 #define MESHDISPLAY_SOLID           0x1
 #define MESHDISPLAY_FACELIT         0x2
diff --git a/renderdoc/data/spv/texdisplay.frag b/renderdoc/data/spv/texdisplay.frag
index 978e4cd16..beaf46b16 100644
--- a/renderdoc/data/spv/texdisplay.frag
+++ b/renderdoc/data/spv/texdisplay.frag
@@ -42,7 +42,7 @@ void main(void)
 
 	scr /= texdisplay.Scale;
 
-	if(texType == RESTYPE_TEX1D || texType == RESTYPE_TEXBUFFER)
+	if(texType == RESTYPE_TEX1D)
 	{
 		// by convention display 1D textures as 100 high
 		if(scr.x < 0.0f || scr.x > texdisplay.TextureResolutionPS.x || scr.y < 0.0f || scr.y > 100.0f)
diff --git a/renderdoc/data/spv/texsample.h b/renderdoc/data/spv/texsample.h
index d7b3f00ac..92eabfa1b 100644
--- a/renderdoc/data/spv/texsample.h
+++ b/renderdoc/data/spv/texsample.h
@@ -28,8 +28,7 @@
 layout (binding = 6) uniform sampler1DArray tex1DArray;
 layout (binding = 7) uniform sampler2DArray tex2DArray;
 layout (binding = 8) uniform sampler3D tex3D;
-layout (binding = 9) uniform samplerBuffer texBuffer;
-layout (binding = 10) uniform sampler2DMS tex2DMS;
+layout (binding = 9) uniform sampler2DMS tex2DMS;
 
 vec4 SampleTextureFloat4(int type, vec2 pos, float slice, int mipLevel, int sampleIdx, vec3 texRes)
 {
@@ -47,10 +46,6 @@ vec4 SampleTextureFloat4(int type, vec2 pos, float slice, int mipLevel, int samp
 	{
 		col = textureLod(tex3D, vec3(pos / texRes.xy, slice / texRes.z), float(mipLevel));
 	}
-	else if (type == RESTYPE_TEXBUFFER)
-	{
-		col = texelFetch(texBuffer, int(pos.x));
-	}
 	else if (type == RESTYPE_TEX2DMS)
 	{
 		if(sampleIdx < 0)
@@ -80,8 +75,7 @@ vec4 SampleTextureFloat4(int type, vec2 pos, float slice, int mipLevel, int samp
 layout (binding = 11) uniform usampler1DArray texUInt1DArray;
 layout (binding = 12) uniform usampler2DArray texUInt2DArray;
 layout (binding = 13) uniform usampler3D texUInt3D;
-layout (binding = 14) uniform usamplerBuffer texUIntBuffer;
-layout (binding = 15) uniform usampler2DMS texUInt2DMS;
+layout (binding = 14) uniform usampler2DMS texUInt2DMS;
 
 uvec4 SampleTextureUInt4(int type, vec2 pos, float slice, int mipLevel, int sampleIdx, vec3 texRes)
 {
@@ -99,10 +93,6 @@ uvec4 SampleTextureUInt4(int type, vec2 pos, float slice, int mipLevel, int samp
 	{
 		col = texelFetch(texUInt3D, ivec3(pos, slice), mipLevel);
 	}
-	else if (type == RESTYPE_TEXBUFFER)
-	{
-		col = texelFetch(texUIntBuffer, int(pos.x));
-	}
 	else if (type == RESTYPE_TEX2DMS)
 	{
 		if(sampleIdx < 0)
@@ -120,8 +110,7 @@ uvec4 SampleTextureUInt4(int type, vec2 pos, float slice, int mipLevel, int samp
 layout (binding = 16) uniform isampler1DArray texSInt1DArray;
 layout (binding = 17) uniform isampler2DArray texSInt2DArray;
 layout (binding = 18) uniform isampler3D texSInt3D;
-layout (binding = 19) uniform isamplerBuffer texSIntBuffer;
-layout (binding = 20) uniform isampler2DMS texSInt2DMS;
+layout (binding = 19) uniform isampler2DMS texSInt2DMS;
 
 ivec4 SampleTextureSInt4(int type, vec2 pos, float slice, int mipLevel, int sampleIdx, vec3 texRes)
 {
@@ -139,10 +128,6 @@ ivec4 SampleTextureSInt4(int type, vec2 pos, float slice, int mipLevel, int samp
 	{
 		col = texelFetch(texSInt3D, ivec3(pos, slice), mipLevel);
 	}
-	else if (type == RESTYPE_TEXBUFFER)
-	{
-		col = texelFetch(texSIntBuffer, int(pos.x));
-	}
 	else if (type == RESTYPE_TEX2DMS)
 	{
 		if(sampleIdx < 0)
diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp
index bbb197b29..48753d621 100644
--- a/renderdoc/driver/vulkan/vk_replay.cpp
+++ b/renderdoc/driver/vulkan/vk_replay.cpp
@@ -1034,8 +1034,6 @@ bool VulkanReplay::RenderTextureInternal(TextureDisplay cfg, VkRenderPassBeginIn
 	displayformat |= textype;
 
 	descSetBinding += textype;
-
-	// VKTODOMED: RESTYPE_TEXBUFFER
 	
 	if(!IsSRGBFormat(iminfo.format) && cfg.linearDisplayAsGamma)
 		displayformat |= TEXDISPLAY_GAMMA_CURVE;