From ba3881b8622b17e915623be4db0e7f87a88e96c9 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Fri, 17 Mar 2017 13:31:16 -1000
Subject: [PATCH] Windows sync

---
 specter/include/specter/TextView.hpp | 2 +-
 specter/lib/TextView.cpp             | 6 +++---
 specter/lib/View.cpp                 | 8 ++++----
 specter/zeus                         | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/specter/include/specter/TextView.hpp b/specter/include/specter/TextView.hpp
index a92249dfa..c8663a4c0 100644
--- a/specter/include/specter/TextView.hpp
+++ b/specter/include/specter/TextView.hpp
@@ -28,7 +28,7 @@ public:
         zeus::CMatrix4f m_mv;
         zeus::CVector3f m_uv[4];
         zeus::CColor m_color;
-        char _dummy[48];
+        //char _dummy[48];
         
         RenderGlyph& operator=(const RenderGlyph& other)
         {
diff --git a/specter/lib/TextView.cpp b/specter/lib/TextView.cpp
index 1105fc450..07a890caa 100644
--- a/specter/lib/TextView.cpp
+++ b/specter/lib/TextView.cpp
@@ -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, boo::ZTest::None, false, boo::CullMode::None);
+                          boo::Primitive::TriStrips, boo::ZTest::None, false, true, true, boo::CullMode::None);
 
     m_subpixel =
     ctx.newShaderPipeline(VS, FSSubpixel, nullptr, nullptr, nullptr, m_vtxFmt,
                           boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1,
-                          boo::Primitive::TriStrips, boo::ZTest::None, false, boo::CullMode::None);
+                          boo::Primitive::TriStrips, boo::ZTest::None, false, true, true, 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, boo::ZTest::None, false, boo::CullMode::None);
+                          boo::Primitive::TriStrips,boo::ZTest::None, false, true, true, boo::CullMode::None);
 }
 
 #endif
diff --git a/specter/lib/View.cpp b/specter/lib/View.cpp
index bdae2ae71..79377d682 100644
--- a/specter/lib/View.cpp
+++ b/specter/lib/View.cpp
@@ -170,7 +170,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, boo::CullMode::None);
+                                          boo::Primitive::TriStrips, boo::ZTest::None, false, true, true, boo::CullMode::None);
 
     boo::VertexElementDescriptor texvdescs[] =
     {
@@ -181,7 +181,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, boo::CullMode::None);
+                                        boo::Primitive::TriStrips, boo::ZTest::None, false, true, true, boo::CullMode::None);
 }
 
 #endif
@@ -300,7 +300,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, boo::CullMode::None);
+                                          boo::Primitive::TriStrips, boo::ZTest::None, false, true, true, boo::CullMode::None);
 
     boo::VertexElementDescriptor texvdescs[] =
     {
@@ -311,7 +311,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, boo::CullMode::None);
+                                        boo::Primitive::TriStrips, boo::ZTest::None, false, true, true, boo::CullMode::None);
 }
 
 #endif
diff --git a/specter/zeus b/specter/zeus
index f1e3db1c5..8603353cf 160000
--- a/specter/zeus
+++ b/specter/zeus
@@ -1 +1 @@
-Subproject commit f1e3db1c504ccdc7fc5ab62d9b64e1ff6692087a
+Subproject commit 8603353cf770d7607f8d169ce4ef3d5842d49ab8