diff --git a/Runtime/Graphics/CLineRendererShadersHLSL.cpp b/Runtime/Graphics/CLineRendererShadersHLSL.cpp index 97aaf6e88..f3f85168f 100644 --- a/Runtime/Graphics/CLineRendererShadersHLSL.cpp +++ b/Runtime/Graphics/CLineRendererShadersHLSL.cpp @@ -127,19 +127,19 @@ CLineRendererShaders::IDataBindingFactory* CLineRendererShaders::Initialize(boo: m_texAlpha = factory.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr(), ComPtr(), ComPtr(), m_texVtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips,false, true, false); m_texAdditive = factory.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr(), ComPtr(), ComPtr(), m_texVtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips,false, false, false); m_noTexAlpha = factory.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr(), ComPtr(), ComPtr(), m_noTexVtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_noTexAdditive = factory.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr(), ComPtr(), ComPtr(), m_noTexVtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); return new struct HLSLLineDataBindingFactory; } diff --git a/Runtime/Particle/CElementGenShadersHLSL.cpp b/Runtime/Particle/CElementGenShadersHLSL.cpp index c63735977..086d90bc6 100644 --- a/Runtime/Particle/CElementGenShadersHLSL.cpp +++ b/Runtime/Particle/CElementGenShadersHLSL.cpp @@ -270,89 +270,89 @@ CElementGenShaders::IDataBindingFactory* CElementGenShaders::Initialize(boo::ID3 m_texZTestZWrite = factory.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, true, false); + boo::Primitive::TriStrips, true, true, false); m_texNoZTestZWrite = factory.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_texZTestNoZWrite = factory.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_texNoZTestNoZWrite = factory.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_texAdditiveZTest = factory.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_texAdditiveNoZTest = factory.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_texRedToAlphaZTest = factory.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX_REDTOALPHA, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_texRedToAlphaNoZTest = factory.newShaderPipeline(VS_HLSL_TEX, FS_HLSL_TEX_REDTOALPHA, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_indTexZWrite = factory.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_INDTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_indTexNoZWrite = factory.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_INDTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_indTexAdditive = factory.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_INDTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_cindTexZWrite = factory.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_CINDTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_cindTexNoZWrite = factory.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_CINDTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_cindTexAdditive = factory.newShaderPipeline(VS_HLSL_INDTEX, FS_HLSL_CINDTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_noTexZTestZWrite = factory.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatNoTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, true, false); + boo::Primitive::TriStrips, true, true, false); m_noTexNoZTestZWrite = factory.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatNoTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_noTexZTestNoZWrite = factory.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatNoTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_noTexNoZTestNoZWrite = factory.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatNoTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_noTexAdditiveZTest = factory.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatNoTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_noTexAdditiveNoZTest = factory.newShaderPipeline(VS_HLSL_NOTEX, FS_HLSL_NOTEX, ComPtr(), ComPtr(), ComPtr(), m_vtxFormatNoTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); return new struct D3DElementDataBindingFactory; } diff --git a/hecl b/hecl index 3baf9184b..beab85bd0 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 3baf9184b921d000c997975bb112360e06b9fd75 +Subproject commit beab85bd01599155d655872349d7a93b4e6b7373 diff --git a/specter b/specter index cbc19b323..7e6944962 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit cbc19b323b802aa6b1d7b5a655e040f44a9e8534 +Subproject commit 7e6944962177fa250cbe89216648667c058ddb90