From b80cb1ed2949ba3aae20fc2e68ec430217a6cca5 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Fri, 10 Mar 2017 10:52:23 -1000 Subject: [PATCH] frontface culling boo sync --- specter/lib/TextView.cpp | 10 +++++----- specter/lib/View.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specter/lib/TextView.cpp b/specter/lib/TextView.cpp index c70081e91..a4b73f666 100644 --- a/specter/lib/TextView.cpp +++ b/specter/lib/TextView.cpp @@ -77,12 +77,12 @@ void TextView::Resources::init(boo::GLDataFactory::Context& ctx, FontCache* fcac m_regular = ctx.newShaderPipeline(GLSLVS, GLSLFSReg, 1, TexNames, 1, BlockNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); m_subpixel = ctx.newShaderPipeline(GLSLVS, GLSLFSSubpixel, 1, TexNames, 1, BlockNames, boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); } #if _WIN32 @@ -174,12 +174,12 @@ void TextView::Resources::init(boo::ID3DDataFactory::Context& ctx, FontCache* fc m_regular = ctx.newShaderPipeline(VS, FSReg, nullptr, nullptr, nullptr, m_vtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); m_subpixel = ctx.newShaderPipeline(VS, FSSubpixel, nullptr, nullptr, nullptr, m_vtxFmt, boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); } #endif @@ -287,7 +287,7 @@ void TextView::Resources::init(boo::VulkanDataFactory::Context& ctx, FontCache* m_regular = ctx.newShaderPipeline(GLSLVS, GLSLFSReg, m_vtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); } #endif diff --git a/specter/lib/View.cpp b/specter/lib/View.cpp index f9a38623e..8bd216b49 100644 --- a/specter/lib/View.cpp +++ b/specter/lib/View.cpp @@ -81,11 +81,11 @@ void View::Resources::init(boo::GLDataFactory::Context& ctx, const IThemeData& t { m_solidShader = ctx.newShaderPipeline(GLSLSolidVS, GLSLSolidFS, 0, nullptr, 1, BlockNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); m_texShader = ctx.newShaderPipeline(GLSLTexVS, GLSLTexFS, 1, TexNames, 1, BlockNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); } #if _WIN32 @@ -168,7 +168,7 @@ void View::Resources::init(boo::ID3DDataFactory::Context& ctx, const IThemeData& m_solidShader = ctx.newShaderPipeline(SolidVS, SolidFS, nullptr, nullptr, nullptr, m_solidVtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); boo::VertexElementDescriptor texvdescs[] = { @@ -179,7 +179,7 @@ void View::Resources::init(boo::ID3DDataFactory::Context& ctx, const IThemeData& m_texShader = ctx.newShaderPipeline(TexVS, TexFS, nullptr, nullptr, nullptr, m_texVtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); } #endif @@ -298,7 +298,7 @@ void View::Resources::init(boo::VulkanDataFactory::Context& ctx, const IThemeDat m_solidShader = ctx.newShaderPipeline(GLSLSolidVS, GLSLSolidFS, m_solidVtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); boo::VertexElementDescriptor texvdescs[] = { @@ -309,7 +309,7 @@ void View::Resources::init(boo::VulkanDataFactory::Context& ctx, const IThemeDat m_texShader = ctx.newShaderPipeline(GLSLTexVS, GLSLTexFS, m_texVtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, - boo::Primitive::TriStrips, false, false, false); + boo::Primitive::TriStrips, false, false, boo::CullMode::None); } #endif