From 3093e6017322d2adfce2b364100ffcf030423964 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 23 Mar 2016 22:16:57 -1000 Subject: [PATCH] Vulkan sync --- Runtime/Graphics/CLineRendererShadersGLSL.cpp | 8 ++-- Runtime/Particle/CElementGenShadersGLSL.cpp | 40 +++++++++---------- hecl | 2 +- specter | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Runtime/Graphics/CLineRendererShadersGLSL.cpp b/Runtime/Graphics/CLineRendererShadersGLSL.cpp index 98871048e..3470eaba1 100644 --- a/Runtime/Graphics/CLineRendererShadersGLSL.cpp +++ b/Runtime/Graphics/CLineRendererShadersGLSL.cpp @@ -183,16 +183,16 @@ CLineRendererShaders::IDataBindingFactory* CLineRendererShaders::Initialize(boo: m_texAlpha = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX, m_texVtxFmt, 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, m_texVtxFmt, 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, m_noTexVtxFmt, 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, m_noTexVtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); return new struct VulkanLineDataBindingFactory; } diff --git a/Runtime/Particle/CElementGenShadersGLSL.cpp b/Runtime/Particle/CElementGenShadersGLSL.cpp index d6ad3c9dc..2832c781a 100644 --- a/Runtime/Particle/CElementGenShadersGLSL.cpp +++ b/Runtime/Particle/CElementGenShadersGLSL.cpp @@ -425,70 +425,70 @@ CElementGenShaders::IDataBindingFactory* CElementGenShaders::Initialize(boo::Vul m_texZTestZWrite = factory.newShaderPipeline(VS_GLSL_TEX, FS_GLSL_TEX, m_vtxFormatTex, 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, m_vtxFormatTex, 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, m_vtxFormatTex, 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, m_vtxFormatTex, 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, m_vtxFormatTex, 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, m_vtxFormatTex, 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, m_vtxFormatTex, 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, m_vtxFormatTex, 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, m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, true, false); + boo::Primitive::TriStrips, true, true, false); m_indTexNoZWrite = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_INDTEX, m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_indTexAdditive = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_INDTEX, m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - true, true, false); + boo::Primitive::TriStrips, true, true, false); m_cindTexZWrite = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_CINDTEX, m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, true, false); + boo::Primitive::TriStrips, true, true, false); m_cindTexNoZWrite = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_CINDTEX, m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - true, false, false); + boo::Primitive::TriStrips, true, false, false); m_cindTexAdditive = factory.newShaderPipeline(VS_GLSL_INDTEX, FS_GLSL_CINDTEX, m_vtxFormatIndTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - true, true, false); + boo::Primitive::TriStrips, true, true, false); m_noTexZTestZWrite = factory.newShaderPipeline(VS_GLSL_NOTEX, FS_GLSL_NOTEX, m_vtxFormatNoTex, 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, m_vtxFormatNoTex, 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, m_vtxFormatNoTex, 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, m_vtxFormatNoTex, 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, m_vtxFormatNoTex, 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, m_vtxFormatNoTex, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, - false, false, false); + boo::Primitive::TriStrips, false, false, false); return new struct VulkanElementDataBindingFactory; } diff --git a/hecl b/hecl index b413680ac..3baf9184b 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit b413680ace23e0f51bffbaf6eb572df7912a6e6a +Subproject commit 3baf9184b921d000c997975bb112360e06b9fd75 diff --git a/specter b/specter index d3e4c1a63..cbc19b323 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit d3e4c1a63bd24ae946bab4560aaaeee288a3018e +Subproject commit cbc19b323b802aa6b1d7b5a655e040f44a9e8534