diff --git a/3rdparty/bgfx/src/shader_spirv.cpp b/3rdparty/bgfx/src/shader_spirv.cpp
index 7226f90fe78..2d30e996af6 100644
--- a/3rdparty/bgfx/src/shader_spirv.cpp
+++ b/3rdparty/bgfx/src/shader_spirv.cpp
@@ -706,54 +706,54 @@ namespace bgfx
 		SpvOperand::Enum operands[2];
 	};
 
-	static const SpvDecorationInfo s_spvDecorationInfo[] =
-	{
-		{ /* RelaxedPrecision     */ SPV_OPERAND(_) },
-		{ /* SpecId               */ SPV_OPERAND(LiteralNumber) },
-		{ /* Block                */ SPV_OPERAND(_) },
-		{ /* BufferBlock          */ SPV_OPERAND(_) },
-		{ /* RowMajor             */ SPV_OPERAND(_) },
-		{ /* ColMajor             */ SPV_OPERAND(_) },
-		{ /* ArrayStride          */ SPV_OPERAND(LiteralNumber) },
-		{ /* MatrixStride         */ SPV_OPERAND(LiteralNumber) },
-		{ /* GLSLShared           */ SPV_OPERAND(_) },
-		{ /* GLSLPacked           */ SPV_OPERAND(_) },
-		{ /* CPacked              */ SPV_OPERAND(_) },
-		{ /* BuiltIn              */ SPV_OPERAND(LiteralNumber) },
-		{ /* Unknown12            */ SPV_OPERAND(_) },
-		{ /* NoPerspective        */ SPV_OPERAND(_) },
-		{ /* Flat                 */ SPV_OPERAND(_) },
-		{ /* Patch                */ SPV_OPERAND(_) },
-		{ /* Centroid             */ SPV_OPERAND(_) },
-		{ /* Sample               */ SPV_OPERAND(_) },
-		{ /* Invariant            */ SPV_OPERAND(_) },
-		{ /* Restrict             */ SPV_OPERAND(_) },
-		{ /* Aliased              */ SPV_OPERAND(_) },
-		{ /* Volatile             */ SPV_OPERAND(_) },
-		{ /* Constant             */ SPV_OPERAND(_) },
-		{ /* Coherent             */ SPV_OPERAND(_) },
-		{ /* NonWritable          */ SPV_OPERAND(_) },
-		{ /* NonReadable          */ SPV_OPERAND(_) },
-		{ /* Uniform              */ SPV_OPERAND(_) },
-		{ /* Unknown27            */ SPV_OPERAND(_) },
-		{ /* SaturatedConversion  */ SPV_OPERAND(_) },
-		{ /* Stream               */ SPV_OPERAND(LiteralNumber) },
-		{ /* Location             */ SPV_OPERAND(LiteralNumber) },
-		{ /* Component            */ SPV_OPERAND(LiteralNumber) },
-		{ /* Index                */ SPV_OPERAND(LiteralNumber) },
-		{ /* Binding              */ SPV_OPERAND(LiteralNumber) },
-		{ /* DescriptorSet        */ SPV_OPERAND(LiteralNumber) },
-		{ /* Offset               */ SPV_OPERAND(LiteralNumber) },
-		{ /* XfbBuffer            */ SPV_OPERAND(LiteralNumber) },
-		{ /* XfbStride            */ SPV_OPERAND(LiteralNumber) },
-		{ /* FuncParamAttr        */ SPV_OPERAND(_) },
-		{ /* FPRoundingMode       */ SPV_OPERAND(_) },
-		{ /* FPFastMathMode       */ SPV_OPERAND(_) },
-		{ /* LinkageAttributes    */ SPV_OPERAND(LiteralString, LinkageType) },
-		{ /* NoContraction        */ SPV_OPERAND(_) },
-		{ /* InputAttachmentIndex */ SPV_OPERAND(LiteralNumber) },
-		{ /* Alignment            */ SPV_OPERAND(LiteralNumber) },
-	};
+//	static const SpvDecorationInfo s_spvDecorationInfo[] =
+//	{
+//		{ /* RelaxedPrecision     */ SPV_OPERAND(_) },
+//		{ /* SpecId               */ SPV_OPERAND(LiteralNumber) },
+//		{ /* Block                */ SPV_OPERAND(_) },
+//		{ /* BufferBlock          */ SPV_OPERAND(_) },
+//		{ /* RowMajor             */ SPV_OPERAND(_) },
+//		{ /* ColMajor             */ SPV_OPERAND(_) },
+//		{ /* ArrayStride          */ SPV_OPERAND(LiteralNumber) },
+//		{ /* MatrixStride         */ SPV_OPERAND(LiteralNumber) },
+//		{ /* GLSLShared           */ SPV_OPERAND(_) },
+//		{ /* GLSLPacked           */ SPV_OPERAND(_) },
+//		{ /* CPacked              */ SPV_OPERAND(_) },
+//		{ /* BuiltIn              */ SPV_OPERAND(LiteralNumber) },
+//		{ /* Unknown12            */ SPV_OPERAND(_) },
+//		{ /* NoPerspective        */ SPV_OPERAND(_) },
+//		{ /* Flat                 */ SPV_OPERAND(_) },
+//		{ /* Patch                */ SPV_OPERAND(_) },
+//		{ /* Centroid             */ SPV_OPERAND(_) },
+//		{ /* Sample               */ SPV_OPERAND(_) },
+//		{ /* Invariant            */ SPV_OPERAND(_) },
+//		{ /* Restrict             */ SPV_OPERAND(_) },
+//		{ /* Aliased              */ SPV_OPERAND(_) },
+//		{ /* Volatile             */ SPV_OPERAND(_) },
+//		{ /* Constant             */ SPV_OPERAND(_) },
+//		{ /* Coherent             */ SPV_OPERAND(_) },
+//		{ /* NonWritable          */ SPV_OPERAND(_) },
+//		{ /* NonReadable          */ SPV_OPERAND(_) },
+//		{ /* Uniform              */ SPV_OPERAND(_) },
+//		{ /* Unknown27            */ SPV_OPERAND(_) },
+//		{ /* SaturatedConversion  */ SPV_OPERAND(_) },
+//		{ /* Stream               */ SPV_OPERAND(LiteralNumber) },
+//		{ /* Location             */ SPV_OPERAND(LiteralNumber) },
+//		{ /* Component            */ SPV_OPERAND(LiteralNumber) },
+//		{ /* Index                */ SPV_OPERAND(LiteralNumber) },
+//		{ /* Binding              */ SPV_OPERAND(LiteralNumber) },
+//		{ /* DescriptorSet        */ SPV_OPERAND(LiteralNumber) },
+//		{ /* Offset               */ SPV_OPERAND(LiteralNumber) },
+//		{ /* XfbBuffer            */ SPV_OPERAND(LiteralNumber) },
+//		{ /* XfbStride            */ SPV_OPERAND(LiteralNumber) },
+//		{ /* FuncParamAttr        */ SPV_OPERAND(_) },
+//		{ /* FPRoundingMode       */ SPV_OPERAND(_) },
+//		{ /* FPFastMathMode       */ SPV_OPERAND(_) },
+//		{ /* LinkageAttributes    */ SPV_OPERAND(LiteralString, LinkageType) },
+//		{ /* NoContraction        */ SPV_OPERAND(_) },
+//		{ /* InputAttachmentIndex */ SPV_OPERAND(LiteralNumber) },
+//		{ /* Alignment            */ SPV_OPERAND(LiteralNumber) },
+//	};
 
 	static const char* s_spvDecoration[] =
 	{
diff --git a/3rdparty/compat/winsdk-override/wrl/client.h b/3rdparty/compat/winsdk-override/wrl/client.h
index 5e3e0c35fb1..f54e82dc5b2 100644
--- a/3rdparty/compat/winsdk-override/wrl/client.h
+++ b/3rdparty/compat/winsdk-override/wrl/client.h
@@ -79,10 +79,6 @@ namespace Microsoft {
             ComPtr() throw() : ptr_(nullptr) {}
             ComPtr(decltype(nullptr)) throw() : ptr_(nullptr) {}
 
-            template<class U> ComPtr(U *other) throw() : ptr_(other.ptr_) {
-                InternalAddRef();
-            }
-
             ComPtr(const ComPtr &other) throw() : ptr_(other.ptr_) {
                 InternalAddRef();
             }
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index 3706b68042d..6981a490ac7 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -60,8 +60,8 @@ static direct3dx9_loadeffect_ptr g_load_effect = nullptr;
 //============================================================
 
 shaders::shaders() :
-	d3dintf(nullptr), machine(nullptr), d3d(nullptr), num_screens(0), curr_screen(0), curr_frame(0),
-	vecbuf_type(), vecbuf_index(0), vecbuf_count(0), avi_output_file(nullptr), avi_frame(0), avi_copy_surface(nullptr), avi_copy_texture(nullptr), avi_final_target(nullptr), avi_final_texture(nullptr),
+	d3dintf(nullptr), machine(nullptr), d3d(nullptr), num_screens(0), curr_screen(0),
+	avi_output_file(nullptr), avi_frame(0), avi_copy_surface(nullptr), avi_copy_texture(nullptr), avi_final_target(nullptr), avi_final_texture(nullptr),
 	black_surface(nullptr), black_texture(nullptr), render_snap(false), snap_rendered(false), snap_copy_target(nullptr), snap_copy_texture(nullptr), snap_target(nullptr), snap_texture(nullptr),
 	snap_width(0), snap_height(0), lines_pending(false), backbuffer(nullptr), curr_effect(nullptr), default_effect(nullptr), prescale_effect(nullptr), post_effect(nullptr), distortion_effect(nullptr),
 	focus_effect(nullptr), phosphor_effect(nullptr), deconverge_effect(nullptr), color_effect(nullptr), ntsc_effect(nullptr), bloom_effect(nullptr),
diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h
index 74dd433a406..29a7766affe 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.h
+++ b/src/osd/modules/render/d3d/d3dhlsl.h
@@ -387,14 +387,10 @@ private:
 	bool                    paused;                     // whether or not rendering is currently paused
 	int                     num_screens;                // number of emulated physical screens
 	int                     curr_screen;                // current screen for render target operations
-	int                     curr_frame;                 // current frame (0/1) of a screen for render target operations
 	int                     lastidx;                    // index of the last-encountered target
 	bitmap_argb32           shadow_bitmap;              // shadow mask bitmap for post-processing shader
 	texture_info *          shadow_texture;             // shadow mask texture for post-processing shader
 	hlsl_options *          options;                    // current options
-	D3DPRIMITIVETYPE        vecbuf_type;
-	UINT32                  vecbuf_index;
-	UINT32                  vecbuf_count;
 
 	avi_file::ptr           avi_output_file;            // AVI file
 	bitmap_rgb32            avi_snap;                   // AVI snapshot