From 7f8e21a9993b0e064f6caca0928c3e582955243f Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 23 Mar 2016 22:07:22 -1000 Subject: [PATCH] Update shader pipeline calls --- Runtime/Graphics/CLineRendererShadersGLSL.cpp | 8 ++-- .../Graphics/CLineRendererShadersMetal.cpp | 8 ++-- Runtime/Graphics/CMoviePlayer.cpp | 8 ++-- Runtime/Particle/CElementGenShadersGLSL.cpp | 40 +++++++++---------- Runtime/Particle/CElementGenShadersMetal.cpp | 40 +++++++++---------- hecl | 2 +- specter | 2 +- 7 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Runtime/Graphics/CLineRendererShadersGLSL.cpp b/Runtime/Graphics/CLineRendererShadersGLSL.cpp index 8f98fd0c1..98871048e 100644 --- a/Runtime/Graphics/CLineRendererShadersGLSL.cpp +++ b/Runtime/Graphics/CLineRendererShadersGLSL.cpp @@ -128,16 +128,16 @@ CLineRendererShaders::IDataBindingFactory* CLineRendererShaders::Initialize(boo: m_texAlpha = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX, 1, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_texAdditive = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX, 1, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_noTexAlpha = factory.newShaderPipeline(VS_GLSL_NOTEX, FS_GLSL_NOTEX, 1, nullptr, 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_noTexAdditive = factory.newShaderPipeline(VS_GLSL_NOTEX, FS_GLSL_NOTEX, 1, nullptr, 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); return new struct OGLLineDataBindingFactory; } diff --git a/Runtime/Graphics/CLineRendererShadersMetal.cpp b/Runtime/Graphics/CLineRendererShadersMetal.cpp index 105ec603e..e45d0611b 100644 --- a/Runtime/Graphics/CLineRendererShadersMetal.cpp +++ b/Runtime/Graphics/CLineRendererShadersMetal.cpp @@ -141,19 +141,19 @@ CLineRendererShaders::IDataBindingFactory* CLineRendererShaders::Initialize(boo: m_texAlpha = factory.newShaderPipeline(VS_METAL_TEX, FS_METAL_TEX, m_texVtxFmt, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_texAdditive = factory.newShaderPipeline(VS_METAL_TEX, FS_METAL_TEX, m_texVtxFmt, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_noTexAlpha = factory.newShaderPipeline(VS_METAL_NOTEX, FS_METAL_NOTEX, m_noTexVtxFmt, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_noTexAdditive = factory.newShaderPipeline(VS_METAL_NOTEX, FS_METAL_NOTEX, m_noTexVtxFmt, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); return new struct MetalLineDataBindingFactory; } diff --git a/Runtime/Graphics/CMoviePlayer.cpp b/Runtime/Graphics/CMoviePlayer.cpp index 986a17f0c..dfb55dcdf 100644 --- a/Runtime/Graphics/CMoviePlayer.cpp +++ b/Runtime/Graphics/CMoviePlayer.cpp @@ -208,7 +208,7 @@ void CMoviePlayer::Initialize() YUVShaderPipeline = static_cast(CGraphics::g_BooFactory)->newShaderPipeline (VS_GLSL_YUV, FS_GLSL_YUV, 3, "texs", 1, BlockNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); break; #if _WIN32 case boo::IGraphicsDataFactory::Platform::D3D11: @@ -216,7 +216,7 @@ void CMoviePlayer::Initialize() YUVShaderPipeline = static_cast(CGraphics::g_BooFactory)->newShaderPipeline (VS_HLSL_YUV, FS_HLSL_YUV, ComPtr(), ComPtr(), ComPtr(), YUVVTXFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); break; #endif #if BOO_HAS_METAL @@ -224,7 +224,7 @@ void CMoviePlayer::Initialize() YUVShaderPipeline = static_cast(CGraphics::g_BooFactory)->newShaderPipeline (VS_METAL_YUV, FS_METAL_YUV, YUVVTXFmt, 1, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); break; #endif #if BOO_HAS_VULKAN @@ -232,7 +232,7 @@ void CMoviePlayer::Initialize() YUVShaderPipeline = static_cast(CGraphics::g_BooFactory)->newShaderPipeline (VS_GLSL_YUV, FS_GLSL_YUV, YUVVTXFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); break; #endif default: break; diff --git a/Runtime/Particle/CElementGenShadersGLSL.cpp b/Runtime/Particle/CElementGenShadersGLSL.cpp index d5b2f9775..d6ad3c9dc 100644 --- a/Runtime/Particle/CElementGenShadersGLSL.cpp +++ b/Runtime/Particle/CElementGenShadersGLSL.cpp @@ -272,70 +272,70 @@ CElementGenShaders::IDataBindingFactory* CElementGenShaders::Initialize(boo::GLD m_texZTestZWrite = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX, 1, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, true, false); + boo::Primitive::TriStrips, true, true, false); m_texNoZTestZWrite = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX, 1, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_texZTestNoZWrite = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX, 1, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_texNoZTestNoZWrite = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX, 1, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_texAdditiveZTest = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX, 1, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_texAdditiveNoZTest = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX, 1, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_texRedToAlphaZTest = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX_REDTOALPHA, 1, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_texRedToAlphaNoZTest = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX_REDTOALPHA, 1, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_indTexZWrite = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_INDTEX, 3, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_indTexNoZWrite = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_INDTEX, 3, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_indTexAdditive = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_INDTEX, 3, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_cindTexZWrite = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_CINDTEX, 3, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_cindTexNoZWrite = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_CINDTEX, 3, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_cindTexAdditive = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_CINDTEX, 3, "texs", 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_noTexZTestZWrite = factory.newShaderPipeline(VS_GLSL_NOTEX, FS_GLSL_NOTEX, 0, nullptr, 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, true, false); + boo::Primitive::TriStrips, true, true, false); m_noTexNoZTestZWrite = factory.newShaderPipeline(VS_GLSL_NOTEX, FS_GLSL_NOTEX, 0, nullptr, 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_noTexZTestNoZWrite = factory.newShaderPipeline(VS_GLSL_NOTEX, FS_GLSL_NOTEX, 0, nullptr, 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_noTexNoZTestNoZWrite = factory.newShaderPipeline(VS_GLSL_NOTEX, FS_GLSL_NOTEX, 0, nullptr, 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_noTexAdditiveZTest = factory.newShaderPipeline(VS_GLSL_NOTEX, FS_GLSL_NOTEX, 0, nullptr, 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_noTexAdditiveNoZTest = factory.newShaderPipeline(VS_GLSL_NOTEX, FS_GLSL_NOTEX, 0, nullptr, 1, UniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); return new struct OGLElementDataBindingFactory; } diff --git a/Runtime/Particle/CElementGenShadersMetal.cpp b/Runtime/Particle/CElementGenShadersMetal.cpp index 61f6d73af..caa7fdce0 100644 --- a/Runtime/Particle/CElementGenShadersMetal.cpp +++ b/Runtime/Particle/CElementGenShadersMetal.cpp @@ -291,89 +291,89 @@ CElementGenShaders::IDataBindingFactory* CElementGenShaders::Initialize(boo::Met m_texZTestZWrite = factory.newShaderPipeline(VS_METAL_TEX, FS_METAL_TEX, m_vtxFormatTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, true, false); + boo::Primitive::TriStrips, true, true, false); m_texNoZTestZWrite = factory.newShaderPipeline(VS_METAL_TEX, FS_METAL_TEX, m_vtxFormatTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_texZTestNoZWrite = factory.newShaderPipeline(VS_METAL_TEX, FS_METAL_TEX, m_vtxFormatTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_texNoZTestNoZWrite = factory.newShaderPipeline(VS_METAL_TEX, FS_METAL_TEX, m_vtxFormatTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_texAdditiveZTest = factory.newShaderPipeline(VS_METAL_TEX, FS_METAL_TEX, m_vtxFormatTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_texAdditiveNoZTest = factory.newShaderPipeline(VS_METAL_TEX, FS_METAL_TEX, m_vtxFormatTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_texRedToAlphaZTest = factory.newShaderPipeline(VS_METAL_TEX, FS_METAL_TEX_REDTOALPHA, m_vtxFormatTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_texRedToAlphaNoZTest = factory.newShaderPipeline(VS_METAL_TEX, FS_METAL_TEX_REDTOALPHA, m_vtxFormatTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_indTexZWrite = factory.newShaderPipeline(VS_METAL_INDTEX, FS_METAL_INDTEX, m_vtxFormatIndTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_indTexNoZWrite = factory.newShaderPipeline(VS_METAL_INDTEX, FS_METAL_INDTEX, m_vtxFormatIndTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_indTexAdditive = factory.newShaderPipeline(VS_METAL_INDTEX, FS_METAL_INDTEX, m_vtxFormatIndTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_cindTexZWrite = factory.newShaderPipeline(VS_METAL_INDTEX, FS_METAL_CINDTEX, m_vtxFormatIndTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_cindTexNoZWrite = factory.newShaderPipeline(VS_METAL_INDTEX, FS_METAL_CINDTEX, m_vtxFormatIndTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_cindTexAdditive = factory.newShaderPipeline(VS_METAL_INDTEX, FS_METAL_CINDTEX, m_vtxFormatIndTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_noTexZTestZWrite = factory.newShaderPipeline(VS_METAL_NOTEX, FS_METAL_NOTEX, m_vtxFormatNoTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, true, false); + boo::Primitive::TriStrips, true, true, false); m_noTexNoZTestZWrite = factory.newShaderPipeline(VS_METAL_NOTEX, FS_METAL_NOTEX, m_vtxFormatNoTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, true, false); + boo::Primitive::TriStrips, false, true, false); m_noTexZTestNoZWrite = factory.newShaderPipeline(VS_METAL_NOTEX, FS_METAL_NOTEX, m_vtxFormatNoTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_noTexNoZTestNoZWrite = factory.newShaderPipeline(VS_METAL_NOTEX, FS_METAL_NOTEX, m_vtxFormatNoTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - false, false, false); + boo::Primitive::TriStrips, false, false, false); m_noTexAdditiveZTest = factory.newShaderPipeline(VS_METAL_NOTEX, FS_METAL_NOTEX, m_vtxFormatNoTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_noTexAdditiveNoZTest = factory.newShaderPipeline(VS_METAL_NOTEX, FS_METAL_NOTEX, m_vtxFormatNoTex, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); return new struct MetalElementDataBindingFactory; } diff --git a/hecl b/hecl index 83eae36cd..b413680ac 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 83eae36cdc3193e941957c210c274f5f425eff57 +Subproject commit b413680ace23e0f51bffbaf6eb572df7912a6e6a diff --git a/specter b/specter index 8a6317a45..d3e4c1a63 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 8a6317a45035035a9fe911232edb4adf4b7260d9 +Subproject commit d3e4c1a63bd24ae946bab4560aaaeee288a3018e