AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 11:07:43 +00:00
Code Issues Projects Releases Wiki Activity

UWP support

Browse Source
This commit is contained in:
Jack Andersen
2017-12-05 17:25:33 -10:00
parent 532c63fe62
commit 01e0bfde7e
6 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
specter/freetype2

Submodule specter/freetype2 updated: b5f9faacba...6f049e5c97

2
specter/include/specter/TextView.hpp
View File

@@ -91,7 +91,9 @@ public:
boo::ObjToken<boo::IShaderPipeline> m_subpixel; boo::ObjToken<boo::IShaderPipeline> m_subpixel;
boo::ObjToken<boo::IVertexFormat> m_vtxFmt; /* Not OpenGL */ boo::ObjToken<boo::IVertexFormat> m_vtxFmt; /* Not OpenGL */
#if BOO_HAS_GL
void init(boo::GLDataFactory::Context& ctx, FontCache* fcache); void init(boo::GLDataFactory::Context& ctx, FontCache* fcache);
#endif
#if _WIN32 #if _WIN32
void init(boo::ID3DDataFactory::Context& ctx, FontCache* fcache); void init(boo::ID3DDataFactory::Context& ctx, FontCache* fcache);
#endif #endif

2
specter/include/specter/View.hpp
View File

@@ -205,7 +205,9 @@ public:
boo::ObjToken<boo::IShaderPipeline> m_texShader; boo::ObjToken<boo::IShaderPipeline> m_texShader;
boo::ObjToken<boo::IVertexFormat> m_texVtxFmt; /* Not OpenGL */ boo::ObjToken<boo::IVertexFormat> m_texVtxFmt; /* Not OpenGL */
#if BOO_HAS_GL
void init(boo::GLDataFactory::Context& ctx, const IThemeData& theme); void init(boo::GLDataFactory::Context& ctx, const IThemeData& theme);
#endif
#if _WIN32 #if _WIN32
void init(boo::ID3DDataFactory::Context& ctx, const IThemeData& theme); void init(boo::ID3DDataFactory::Context& ctx, const IThemeData& theme);
#endif #endif

2
specter/lib/TextView.cpp
View File

@@ -10,6 +10,7 @@ namespace specter
{ {
static logvisor::Module Log("specter::TextView"); static logvisor::Module Log("specter::TextView");
#if BOO_HAS_GL
static const char* GLSLVS = static const char* GLSLVS =
"#version 330\n" "#version 330\n"
BOO_GLSL_BINDING_HEAD BOO_GLSL_BINDING_HEAD
@@ -85,6 +86,7 @@ void TextView::Resources::init(boo::GLDataFactory::Context& ctx, FontCache* fcac
boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1, boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1,
boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None);
} }
#endif
#if _WIN32 #if _WIN32

2
specter/lib/View.cpp
View File

@@ -6,6 +6,7 @@ namespace specter
{ {
static logvisor::Module Log("specter::View"); static logvisor::Module Log("specter::View");
#if BOO_HAS_GL
static const char* GLSLSolidVS = static const char* GLSLSolidVS =
"#version 330\n" "#version 330\n"
BOO_GLSL_BINDING_HEAD BOO_GLSL_BINDING_HEAD
@@ -89,6 +90,7 @@ void View::Resources::init(boo::GLDataFactory::Context& ctx, const IThemeData& t
boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false,
boo::CullMode::None); boo::CullMode::None);
} }
#endif
#if _WIN32 #if _WIN32

2
specter/lib/ViewResources.cpp
View File

@@ -22,9 +22,11 @@ void ViewResources::init(boo::IGraphicsDataFactory* factory, FontCache* fcache,
{ {
switch (ctx.platform()) switch (ctx.platform())
{ {
#if BOO_HAS_GL
case boo::IGraphicsDataFactory::Platform::OpenGL: case boo::IGraphicsDataFactory::Platform::OpenGL:
init<boo::GLDataFactory::Context>(static_cast<boo::GLDataFactory::Context&>(ctx), *theme, fcache); init<boo::GLDataFactory::Context>(static_cast<boo::GLDataFactory::Context&>(ctx), *theme, fcache);
break; break;
#endif
#if _WIN32 #if _WIN32
case boo::IGraphicsDataFactory::Platform::D3D11: case boo::IGraphicsDataFactory::Platform::D3D11:
case boo::IGraphicsDataFactory::Platform::D3D12: case boo::IGraphicsDataFactory::Platform::D3D12: