diff --git a/Runtime/Graphics/CMoviePlayer.cpp b/Runtime/Graphics/CMoviePlayer.cpp
index 33b61d2bb..330aad570 100644
--- a/Runtime/Graphics/CMoviePlayer.cpp
+++ b/Runtime/Graphics/CMoviePlayer.cpp
@@ -223,7 +223,7 @@ void CMoviePlayer::Initialize()
         case boo::IGraphicsDataFactory::Platform::D3D11:
         case boo::IGraphicsDataFactory::Platform::D3D12:
             YUVShaderPipeline = static_cast<boo::ID3DDataFactory::Context&>(ctx).newShaderPipeline
-                    (VS_HLSL_YUV, FS_HLSL_YUV, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), YUVVTXFmt,
+                    (VS_HLSL_YUV, FS_HLSL_YUV, nullptr, nullptr, nullptr, YUVVTXFmt,
                      boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                      boo::Primitive::TriStrips, false, false, false);
             break;
diff --git a/Runtime/Graphics/Shaders/CCameraBlurFilterHLSL.cpp b/Runtime/Graphics/Shaders/CCameraBlurFilterHLSL.cpp
index 7cb9bc4f3..8587f3d62 100644
--- a/Runtime/Graphics/Shaders/CCameraBlurFilterHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CCameraBlurFilterHLSL.cpp
@@ -114,7 +114,7 @@ TShader<CCameraBlurFilter>::IDataBindingFactory* CCameraBlurFilter::Initialize(b
         {nullptr, nullptr, boo::VertexSemantic::UV4}
     };
     s_VtxFmt = ctx.newVertexFormat(2, VtxVmt);
-    s_Pipeline = ctx.newShaderPipeline(VS, FS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_Pipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr,
                                        s_VtxFmt, boo::BlendFactor::SrcAlpha,
                                        boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips, false, false, false);
     return new CCameraBlurFilterD3DDataBindingFactory;
diff --git a/Runtime/Graphics/Shaders/CColoredQuadFilterHLSL.cpp b/Runtime/Graphics/Shaders/CColoredQuadFilterHLSL.cpp
index 44b5f562d..56a9776a7 100644
--- a/Runtime/Graphics/Shaders/CColoredQuadFilterHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CColoredQuadFilterHLSL.cpp
@@ -88,13 +88,13 @@ CColoredQuadFilter::Initialize(boo::ID3DDataFactory::Context& ctx)
         {nullptr, nullptr, boo::VertexSemantic::Position4}
     };
     s_VtxFmt = ctx.newVertexFormat(1, VtxVmt);
-    s_AlphaPipeline = ctx.newShaderPipeline(VS, FS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_AlphaPipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr,
                                             s_VtxFmt, boo::BlendFactor::SrcAlpha,
                                             boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips, false, false, false);
-    s_AddPipeline = ctx.newShaderPipeline(VS, FS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_AddPipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr,
                                           s_VtxFmt, boo::BlendFactor::SrcAlpha,
                                           boo::BlendFactor::One, boo::Primitive::TriStrips, false, false, false);
-    s_MultPipeline = ctx.newShaderPipeline(VS, FS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_MultPipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr,
                                            s_VtxFmt, boo::BlendFactor::SrcColor,
                                            boo::BlendFactor::DstColor, boo::Primitive::TriStrips, false, false, false);
     return new CColoredQuadFilterD3DDataBindingFactory;
diff --git a/Runtime/Graphics/Shaders/CLineRendererShadersHLSL.cpp b/Runtime/Graphics/Shaders/CLineRendererShadersHLSL.cpp
index 585137126..25d0b439e 100644
--- a/Runtime/Graphics/Shaders/CLineRendererShadersHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CLineRendererShadersHLSL.cpp
@@ -125,20 +125,20 @@ CLineRendererShaders::IDataBindingFactory* CLineRendererShaders::Initialize(boo:
     };
     m_noTexVtxFmt = ctx.newVertexFormat(2, VtxFmtNoTex);
 
-    m_texAlpha = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                           ComPtr<ID3DBlob>(), m_texVtxFmt,
+    m_texAlpha = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, nullptr, nullptr,
+                                           nullptr, m_texVtxFmt,
                                            boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                            boo::Primitive::TriStrips,false, true, false);
-    m_texAdditive = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                              ComPtr<ID3DBlob>(), m_texVtxFmt,
+    m_texAdditive = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, nullptr, nullptr,
+                                              nullptr, m_texVtxFmt,
                                               boo::BlendFactor::SrcAlpha, boo::BlendFactor::One,
                                               boo::Primitive::TriStrips,false, false, false);
-    m_noTexAlpha = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                             ComPtr<ID3DBlob>(), m_noTexVtxFmt,
+    m_noTexAlpha = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, nullptr, nullptr,
+                                             nullptr, m_noTexVtxFmt,
                                              boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                              boo::Primitive::TriStrips, false, true, false);
-    m_noTexAdditive = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                ComPtr<ID3DBlob>(), m_noTexVtxFmt,
+    m_noTexAdditive = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, nullptr, nullptr,
+                                                nullptr, m_noTexVtxFmt,
                                                 boo::BlendFactor::SrcAlpha, boo::BlendFactor::One,
                                                 boo::Primitive::TriStrips, false, false, false);
 
diff --git a/Runtime/Graphics/Shaders/CModelShadersGLSL.cpp b/Runtime/Graphics/Shaders/CModelShadersGLSL.cpp
index 48c653dcf..e62257082 100644
--- a/Runtime/Graphics/Shaders/CModelShadersGLSL.cpp
+++ b/Runtime/Graphics/Shaders/CModelShadersGLSL.cpp
@@ -68,7 +68,7 @@ static const char* ThermalPostGLSL =
 "};\n"
 "vec4 ThermalPostFunc(vec4 colorIn)\n"
 "{\n"
-"    return vec4(texture(tex7, vtf.extTcgs[0]).rrr * tmulColor.rgb + addColor.rgb, 1.0);\n"
+"    return vec4(texture(extTex7, vtf.extTcgs[0]).rrr * tmulColor.rgb + addColor.rgb, 1.0);\n"
 "}\n"
 "\n";
 
@@ -91,9 +91,9 @@ static const char* MBShadowPostGLSL =
 "};\n"
 "vec4 MBShadowPostFunc(vec4 colorIn)\n"
 "{\n"
-"    float idTexel = texture(tex0, vtf.extTcgs[0]).a;\n"
-"    float sphereTexel = texture(tex1, vtf.extTcgs[1]).a;\n"
-"    float fadeTexel = texture(tex2, vtf.extTcgs[2]).a;\n"
+"    float idTexel = texture(extTex0, vtf.extTcgs[0]).a;\n"
+"    float sphereTexel = texture(extTex1, vtf.extTcgs[1]).a;\n"
+"    float fadeTexel = texture(extTex2, vtf.extTcgs[2]).a;\n"
 "    float val = ((abs(idTexel - shadowId) < 0.001) ?\n"
 "        (dot(vtf.mvNorm.xyz, shadowUp.xyz) * shadowUp.w) : 0.0) *\n"
 "        sphereTexel * fadeTexel;\n"
diff --git a/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp b/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp
index 44307d919..1e8b98ad1 100644
--- a/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp
@@ -76,7 +76,7 @@ static const char* SolidPostHLSL =
 "{\n"
 "    float4 solidColor;\n"
 "};\n"
-"static float4 SolidPostFunc(float4 colorIn)\n"
+"static float4 SolidPostFunc(in VertToFrag vtf, float4 colorIn)\n"
 "{\n"
 "    return solidColor;\n"
 "}\n"
@@ -88,7 +88,7 @@ static const char* MBShadowPostHLSL =
 "    float4 shadowUp;\n"
 "    float shadowId;\n"
 "};\n"
-"static float4 MBShadowPostFunc(float4 colorIn)\n"
+"static float4 MBShadowPostFunc(in VertToFrag vtf, float4 colorIn)\n"
 "{\n"
 "    float idTexel = extTex0.Sample(samp, vtf.extTcgs[0]).a;\n"
 "    float sphereTexel = extTex1.Sample(samp, vtf.extTcgs[1]).a;\n"
@@ -130,7 +130,7 @@ CModelShaders::GetShaderExtensionsHLSL(boo::IGraphicsDataFactory::Platform plat)
                               0, nullptr, 0, nullptr, hecl::Backend::BlendFactor::One,
                               hecl::Backend::BlendFactor::Zero);
 
-    /* Solid shading */
+    /* MorphBall shadow shading */
     ext.registerExtensionSlot({}, {MBShadowPostHLSL, "MBShadowPostFunc"},
                               0, nullptr, 3, BallFadeTextures,
                               hecl::Backend::BlendFactor::SrcAlpha,
diff --git a/Runtime/Graphics/Shaders/CModelShadersMetal.cpp b/Runtime/Graphics/Shaders/CModelShadersMetal.cpp
index 2086b607b..3206e1112 100644
--- a/Runtime/Graphics/Shaders/CModelShadersMetal.cpp
+++ b/Runtime/Graphics/Shaders/CModelShadersMetal.cpp
@@ -65,9 +65,9 @@ static const char* ThermalPostMetal =
 "    float4 tmulColor;\n"
 "    float4 addColor;\n"
 "};\n"
-"static float4 ThermalPostFunc(thread VertToFrag& vtf, constant ThermalUniform& lu, texture2d<float> tex7, float4 colorIn)\n"
+"static float4 ThermalPostFunc(thread VertToFrag& vtf, constant ThermalUniform& lu, texture2d<float> extTex7, float4 colorIn)\n"
 "{\n"
-"    return float4(tex7.sample(samp, vtf.extTcgs0).rrr * lu.tmulColor.rgb + lu.addColor.rgb, 1.0);\n"
+"    return float4(extTex7.sample(samp, vtf.extTcgs0).rrr * lu.tmulColor.rgb + lu.addColor.rgb, 1.0);\n"
 "}\n"
 "\n";
 
@@ -89,11 +89,11 @@ static const char* MBShadowPostMetal =
 "    float shadowId;\n"
 "};\n"
 "static float4 MBShadowPostFunc(thread VertToFrag& vtf, constant MBShadowUniform& su,\n"
-"                               texture2d<float> tex0, texture2d<float> tex1, texture2d<float> tex2, float4 colorIn)\n"
+"                               texture2d<float> extTex0, texture2d<float> extTex1, texture2d<float> extTex2, float4 colorIn)\n"
 "{\n"
-"    float idTexel = tex0.sample(samp, vtf.extTcgs0).a;\n"
-"    float sphereTexel = tex1.sample(samp, vtf.extTcgs1).a;\n"
-"    float fadeTexel = tex2.sample(samp, vtf.extTcgs2).a;\n"
+"    float idTexel = extTex0.sample(samp, vtf.extTcgs0).a;\n"
+"    float sphereTexel = extTex1.sample(samp, vtf.extTcgs1).a;\n"
+"    float fadeTexel = extTex2.sample(samp, vtf.extTcgs2).a;\n"
 "    float val = ((fabs(idTexel - su.shadowId) < 0.001) ?\n"
 "        (dot(vtf.mvNorm.xyz, su.shadowUp.xyz) * su.shadowUp.w) : 0.0) *\n"
 "        sphereTexel * fadeTexel;\n"
diff --git a/Runtime/Graphics/Shaders/CSpaceWarpFilterHLSL.cpp b/Runtime/Graphics/Shaders/CSpaceWarpFilterHLSL.cpp
index 73f7f54b5..391cb6766 100644
--- a/Runtime/Graphics/Shaders/CSpaceWarpFilterHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CSpaceWarpFilterHLSL.cpp
@@ -81,7 +81,7 @@ TShader<CSpaceWarpFilter>::IDataBindingFactory* CSpaceWarpFilter::Initialize(boo
         {nullptr, nullptr, boo::VertexSemantic::UV4}
     };
     s_VtxFmt = ctx.newVertexFormat(2, VtxVmt);
-    s_Pipeline = ctx.newShaderPipeline(VS, FS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_Pipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr,
                                        s_VtxFmt, boo::BlendFactor::One,
                                        boo::BlendFactor::Zero, boo::Primitive::TriStrips, false, false, false);
     return new CSpaceWarpFilterD3DDataBindingFactory;
diff --git a/Runtime/Graphics/Shaders/CTextSupportShaderHLSL.cpp b/Runtime/Graphics/Shaders/CTextSupportShaderHLSL.cpp
index 3781bfde4..ee20673d3 100644
--- a/Runtime/Graphics/Shaders/CTextSupportShaderHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CTextSupportShaderHLSL.cpp
@@ -126,10 +126,10 @@ CTextSupportShader::Initialize(boo::ID3DDataFactory::Context& ctx)
         {nullptr, nullptr, boo::VertexSemantic::Color | boo::VertexSemantic::Instanced, 2},
     };
     s_TextVtxFmt = ctx.newVertexFormat(11, TextVtxVmt);
-    s_TextAlphaPipeline = ctx.newShaderPipeline(TextVS, TextFS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_TextAlphaPipeline = ctx.newShaderPipeline(TextVS, TextFS, nullptr, nullptr, nullptr,
                                                 s_TextVtxFmt, boo::BlendFactor::SrcAlpha,
                                                 boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips, true, false, false);
-    s_TextAddPipeline = ctx.newShaderPipeline(TextVS, TextFS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_TextAddPipeline = ctx.newShaderPipeline(TextVS, TextFS, nullptr, nullptr, nullptr,
                                               s_TextVtxFmt, boo::BlendFactor::SrcAlpha,
                                               boo::BlendFactor::One, boo::Primitive::TriStrips, true, false, false);
 
@@ -146,10 +146,10 @@ CTextSupportShader::Initialize(boo::ID3DDataFactory::Context& ctx)
         {nullptr, nullptr, boo::VertexSemantic::Color | boo::VertexSemantic::Instanced, 0},
     };
     s_ImageVtxFmt = ctx.newVertexFormat(9, ImageVtxVmt);
-    s_ImageAlphaPipeline = ctx.newShaderPipeline(ImgVS, ImgFS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_ImageAlphaPipeline = ctx.newShaderPipeline(ImgVS, ImgFS, nullptr, nullptr, nullptr,
                                                  s_ImageVtxFmt, boo::BlendFactor::SrcAlpha,
                                                  boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips, true, false, false);
-    s_ImageAddPipeline = ctx.newShaderPipeline(ImgVS, ImgFS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_ImageAddPipeline = ctx.newShaderPipeline(ImgVS, ImgFS, nullptr, nullptr, nullptr,
                                                s_ImageVtxFmt, boo::BlendFactor::SrcAlpha,
                                                boo::BlendFactor::One, boo::Primitive::TriStrips, true, false, false);
 
diff --git a/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp b/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp
index 227352831..2431c3e21 100644
--- a/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp
@@ -143,13 +143,13 @@ CTexturedQuadFilter::Initialize(boo::ID3DDataFactory::Context& ctx)
         {nullptr, nullptr, boo::VertexSemantic::UV4}
     };
     s_VtxFmt = ctx.newVertexFormat(2, VtxVmt);
-    s_AlphaPipeline = ctx.newShaderPipeline(VSNoFlip, FS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_AlphaPipeline = ctx.newShaderPipeline(VSNoFlip, FS, nullptr, nullptr, nullptr,
                                             s_VtxFmt, boo::BlendFactor::SrcAlpha,
                                             boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips, false, false, false);
-    s_AddPipeline = ctx.newShaderPipeline(VSNoFlip, FS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_AddPipeline = ctx.newShaderPipeline(VSNoFlip, FS, nullptr, nullptr, nullptr,
                                           s_VtxFmt, boo::BlendFactor::SrcAlpha,
                                           boo::BlendFactor::One, boo::Primitive::TriStrips, false, false, false);
-    s_MultPipeline = ctx.newShaderPipeline(VSNoFlip, FS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_MultPipeline = ctx.newShaderPipeline(VSNoFlip, FS, nullptr, nullptr, nullptr,
                                            s_VtxFmt, boo::BlendFactor::SrcColor,
                                            boo::BlendFactor::DstColor, boo::Primitive::TriStrips, false, false, false);
     return new CTexturedQuadFilterD3DDataBindingFactory;
@@ -200,13 +200,13 @@ CTexturedQuadFilterAlpha::Initialize(boo::ID3DDataFactory::Context& ctx)
         {nullptr, nullptr, boo::VertexSemantic::UV4}
     };
     s_AVtxFmt = ctx.newVertexFormat(2, VtxVmt);
-    s_AAlphaPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_AAlphaPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, nullptr, nullptr, nullptr,
                                              s_AVtxFmt, boo::BlendFactor::SrcAlpha,
                                              boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips, false, false, false);
-    s_AAddPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_AAddPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, nullptr, nullptr, nullptr,
                                            s_AVtxFmt, boo::BlendFactor::SrcAlpha,
                                            boo::BlendFactor::One, boo::Primitive::TriStrips, false, false, false);
-    s_AMultPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_AMultPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, nullptr, nullptr, nullptr,
                                             s_AVtxFmt, boo::BlendFactor::SrcColor,
                                             boo::BlendFactor::DstColor, boo::Primitive::TriStrips, false, false, false);
     return new CTexturedQuadFilterAlphaD3DDataBindingFactory;
diff --git a/Runtime/Graphics/Shaders/CThermalColdFilterHLSL.cpp b/Runtime/Graphics/Shaders/CThermalColdFilterHLSL.cpp
index 069f98d4c..3b2bbfb3b 100644
--- a/Runtime/Graphics/Shaders/CThermalColdFilterHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CThermalColdFilterHLSL.cpp
@@ -103,7 +103,7 @@ TShader<CThermalColdFilter>::IDataBindingFactory* CThermalColdFilter::Initialize
         {nullptr, nullptr, boo::VertexSemantic::UV4}
     };
     s_VtxFmt = ctx.newVertexFormat(2, VtxVmt);
-    s_Pipeline = ctx.newShaderPipeline(VS, FS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_Pipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr,
                                        s_VtxFmt, boo::BlendFactor::One,
                                        boo::BlendFactor::Zero, boo::Primitive::TriStrips, false, false, false);
     return new CThermalColdFilterD3DDataBindingFactory;
diff --git a/Runtime/Graphics/Shaders/CThermalHotFilterHLSL.cpp b/Runtime/Graphics/Shaders/CThermalHotFilterHLSL.cpp
index d7a89adb7..5702cd0d4 100644
--- a/Runtime/Graphics/Shaders/CThermalHotFilterHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CThermalHotFilterHLSL.cpp
@@ -80,7 +80,7 @@ TShader<CThermalHotFilter>::IDataBindingFactory* CThermalHotFilter::Initialize(b
         {nullptr, nullptr, boo::VertexSemantic::UV4}
     };
     s_VtxFmt = ctx.newVertexFormat(2, VtxVmt);
-    s_Pipeline = ctx.newShaderPipeline(VS, FS, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_Pipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr,
                                        s_VtxFmt, boo::BlendFactor::DstAlpha, boo::BlendFactor::InvDstAlpha,
                                        boo::Primitive::TriStrips, false, false, false);
     return new CThermalHotFilterD3DDataBindingFactory;
diff --git a/Runtime/Graphics/Shaders/CXRayBlurFilterHLSL.cpp b/Runtime/Graphics/Shaders/CXRayBlurFilterHLSL.cpp
index 6f8639d45..d19b1cc0a 100644
--- a/Runtime/Graphics/Shaders/CXRayBlurFilterHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CXRayBlurFilterHLSL.cpp
@@ -95,7 +95,7 @@ TShader<CXRayBlurFilter>::IDataBindingFactory* CXRayBlurFilter::Initialize(boo::
         {nullptr, nullptr, boo::VertexSemantic::UV4}
     };
     s_VtxFmt = ctx.newVertexFormat(2, VtxVmt);
-    s_Pipeline = ctx.newShaderPipeline(VS, FS,  ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
+    s_Pipeline = ctx.newShaderPipeline(VS, FS,  nullptr, nullptr, nullptr,
                                        s_VtxFmt, boo::BlendFactor::One,
                                        boo::BlendFactor::Zero, boo::Primitive::TriStrips, false, false, false);
     return new CXRayBlurFilterD3DDataBindingFactory;
diff --git a/Runtime/Particle/CElementGenShadersHLSL.cpp b/Runtime/Particle/CElementGenShadersHLSL.cpp
index beddc7663..a47765b6e 100644
--- a/Runtime/Particle/CElementGenShadersHLSL.cpp
+++ b/Runtime/Particle/CElementGenShadersHLSL.cpp
@@ -268,90 +268,90 @@ CElementGenShaders::IDataBindingFactory* CElementGenShaders::Initialize(boo::ID3
     };
     m_vtxFormatNoTex = ctx.newVertexFormat(5, TexFmtNoTex);
 
-    m_texZTestZWrite = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                 ComPtr<ID3DBlob>(), m_vtxFormatTex,
+    m_texZTestZWrite = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, nullptr, nullptr,
+                                                 nullptr, m_vtxFormatTex,
                                                  boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                  boo::Primitive::TriStrips, true, true, false);
-    m_texNoZTestZWrite = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                   ComPtr<ID3DBlob>(), m_vtxFormatTex,
+    m_texNoZTestZWrite = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, nullptr, nullptr,
+                                                   nullptr, m_vtxFormatTex,
                                                    boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                    boo::Primitive::TriStrips, false, true, false);
-    m_texZTestNoZWrite = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                   ComPtr<ID3DBlob>(), m_vtxFormatTex,
+    m_texZTestNoZWrite = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, nullptr, nullptr,
+                                                   nullptr, m_vtxFormatTex,
                                                    boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                    boo::Primitive::TriStrips, true, false, false);
-    m_texNoZTestNoZWrite = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                     ComPtr<ID3DBlob>(), m_vtxFormatTex,
+    m_texNoZTestNoZWrite = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, nullptr, nullptr,
+                                                     nullptr, m_vtxFormatTex,
                                                      boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                      boo::Primitive::TriStrips, false, false, false);
 
-    m_texAdditiveZTest = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                   ComPtr<ID3DBlob>(), m_vtxFormatTex,
+    m_texAdditiveZTest = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, nullptr, nullptr,
+                                                   nullptr, m_vtxFormatTex,
                                                    boo::BlendFactor::SrcAlpha, boo::BlendFactor::One,
                                                    boo::Primitive::TriStrips, true, false, false);
-    m_texAdditiveNoZTest = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                     ComPtr<ID3DBlob>(), m_vtxFormatTex,
+    m_texAdditiveNoZTest = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, nullptr, nullptr,
+                                                     nullptr, m_vtxFormatTex,
                                                      boo::BlendFactor::SrcAlpha, boo::BlendFactor::One,
                                                      boo::Primitive::TriStrips, false, false, false);
 
-    m_texRedToAlphaZTest = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX_REDTOALPHA, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                     ComPtr<ID3DBlob>(), m_vtxFormatTex,
+    m_texRedToAlphaZTest = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX_REDTOALPHA, nullptr, nullptr,
+                                                     nullptr, m_vtxFormatTex,
                                                      boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                      boo::Primitive::TriStrips, true, false, false);
-    m_texRedToAlphaNoZTest = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX_REDTOALPHA, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                       ComPtr<ID3DBlob>(), m_vtxFormatTex,
+    m_texRedToAlphaNoZTest = ctx.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX_REDTOALPHA, nullptr, nullptr,
+                                                       nullptr, m_vtxFormatTex,
                                                        boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                        boo::Primitive::TriStrips, false, false, false);
 
-    m_indTexZWrite = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_INDTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                               ComPtr<ID3DBlob>(), m_vtxFormatIndTex,
+    m_indTexZWrite = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_INDTEX, nullptr, nullptr,
+                                               nullptr, m_vtxFormatIndTex,
                                                boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                boo::Primitive::TriStrips, false, true, false);
-    m_indTexNoZWrite = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_INDTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                 ComPtr<ID3DBlob>(), m_vtxFormatIndTex,
+    m_indTexNoZWrite = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_INDTEX, nullptr, nullptr,
+                                                 nullptr, m_vtxFormatIndTex,
                                                  boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                  boo::Primitive::TriStrips, false, false, false);
-    m_indTexAdditive = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_INDTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                 ComPtr<ID3DBlob>(), m_vtxFormatIndTex,
+    m_indTexAdditive = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_INDTEX, nullptr, nullptr,
+                                                 nullptr, m_vtxFormatIndTex,
                                                  boo::BlendFactor::SrcAlpha, boo::BlendFactor::One,
                                                  boo::Primitive::TriStrips, false, true, false);
 
-    m_cindTexZWrite = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_CINDTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                ComPtr<ID3DBlob>(), m_vtxFormatIndTex,
+    m_cindTexZWrite = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_CINDTEX, nullptr, nullptr,
+                                                nullptr, m_vtxFormatIndTex,
                                                 boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                 boo::Primitive::TriStrips, false, true, false);
-    m_cindTexNoZWrite = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_CINDTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                  ComPtr<ID3DBlob>(), m_vtxFormatIndTex,
+    m_cindTexNoZWrite = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_CINDTEX, nullptr, nullptr,
+                                                  nullptr, m_vtxFormatIndTex,
                                                   boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                   boo::Primitive::TriStrips, false, false, false);
-    m_cindTexAdditive = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_CINDTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                  ComPtr<ID3DBlob>(), m_vtxFormatIndTex,
+    m_cindTexAdditive = ctx.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_CINDTEX, nullptr, nullptr,
+                                                  nullptr, m_vtxFormatIndTex,
                                                   boo::BlendFactor::SrcAlpha, boo::BlendFactor::One,
                                                   boo::Primitive::TriStrips, false, true, false);
 
-    m_noTexZTestZWrite = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                   ComPtr<ID3DBlob>(), m_vtxFormatNoTex,
+    m_noTexZTestZWrite = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, nullptr, nullptr,
+                                                   nullptr, m_vtxFormatNoTex,
                                                    boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                    boo::Primitive::TriStrips, true, true, false);
-    m_noTexNoZTestZWrite = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                     ComPtr<ID3DBlob>(), m_vtxFormatNoTex,
+    m_noTexNoZTestZWrite = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, nullptr, nullptr,
+                                                     nullptr, m_vtxFormatNoTex,
                                                      boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                      boo::Primitive::TriStrips, false, true, false);
-    m_noTexZTestNoZWrite = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                     ComPtr<ID3DBlob>(), m_vtxFormatNoTex,
+    m_noTexZTestNoZWrite = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, nullptr, nullptr,
+                                                     nullptr, m_vtxFormatNoTex,
                                                      boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                      boo::Primitive::TriStrips, true, false, false);
-    m_noTexNoZTestNoZWrite = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                       ComPtr<ID3DBlob>(), m_vtxFormatNoTex,
+    m_noTexNoZTestNoZWrite = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, nullptr, nullptr,
+                                                       nullptr, m_vtxFormatNoTex,
                                                        boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
                                                        boo::Primitive::TriStrips, false, false, false);
 
-    m_noTexAdditiveZTest = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                     ComPtr<ID3DBlob>(), m_vtxFormatNoTex,
+    m_noTexAdditiveZTest = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, nullptr, nullptr,
+                                                     nullptr, m_vtxFormatNoTex,
                                                      boo::BlendFactor::SrcAlpha, boo::BlendFactor::One,
                                                      boo::Primitive::TriStrips, true, false, false);
-    m_noTexAdditiveNoZTest = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr<ID3DBlob>(), ComPtr<ID3DBlob>(),
-                                                       ComPtr<ID3DBlob>(), m_vtxFormatNoTex,
+    m_noTexAdditiveNoZTest = ctx.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, nullptr, nullptr,
+                                                       nullptr, m_vtxFormatNoTex,
                                                        boo::BlendFactor::SrcAlpha, boo::BlendFactor::One,
                                                        boo::Primitive::TriStrips, false, false, false);
 
diff --git a/Runtime/World/CMorphBallShadow.cpp b/Runtime/World/CMorphBallShadow.cpp
index 3a61a46f5..5bf10262a 100644
--- a/Runtime/World/CMorphBallShadow.cpp
+++ b/Runtime/World/CMorphBallShadow.cpp
@@ -4,6 +4,7 @@
 #include "GameGlobalObjects.hpp"
 #include "Graphics/CBooRenderer.hpp"
 #include "World/CPlayer.hpp"
+#include "Particle/CGenDescription.hpp"
 
 namespace urde
 {
diff --git a/hecl b/hecl
index b80547d01..f1a75980d 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit b80547d01fb70f349eb6128bd9c44921763f2821
+Subproject commit f1a75980dcaafa4ec1d6e8584a4552ca8ed80dca
diff --git a/specter b/specter
index 717a6bbb1..4838cb439 160000
--- a/specter
+++ b/specter
@@ -1 +1 @@
-Subproject commit 717a6bbb1dd3a9dbe9ab85e58033c8ebca163a92
+Subproject commit 4838cb43970dae46b88ae6061c29e6d33cecf7b0