mirror of https://github.com/AxioDL/metaforce.git
UWP support
This commit is contained in:
parent
532c63fe62
commit
01e0bfde7e
|
@ -1 +1 @@
|
|||
Subproject commit b5f9faacba67b37d52fb788117e39f797f5b04e8
|
||||
Subproject commit 6f049e5c977aaae9d206c33cd26fd847eca34ea4
|
|
@ -91,7 +91,9 @@ public:
|
|||
boo::ObjToken<boo::IShaderPipeline> m_subpixel;
|
||||
boo::ObjToken<boo::IVertexFormat> m_vtxFmt; /* Not OpenGL */
|
||||
|
||||
#if BOO_HAS_GL
|
||||
void init(boo::GLDataFactory::Context& ctx, FontCache* fcache);
|
||||
#endif
|
||||
#if _WIN32
|
||||
void init(boo::ID3DDataFactory::Context& ctx, FontCache* fcache);
|
||||
#endif
|
||||
|
|
|
@ -205,7 +205,9 @@ public:
|
|||
boo::ObjToken<boo::IShaderPipeline> m_texShader;
|
||||
boo::ObjToken<boo::IVertexFormat> m_texVtxFmt; /* Not OpenGL */
|
||||
|
||||
#if BOO_HAS_GL
|
||||
void init(boo::GLDataFactory::Context& ctx, const IThemeData& theme);
|
||||
#endif
|
||||
#if _WIN32
|
||||
void init(boo::ID3DDataFactory::Context& ctx, const IThemeData& theme);
|
||||
#endif
|
||||
|
|
|
@ -10,6 +10,7 @@ namespace specter
|
|||
{
|
||||
static logvisor::Module Log("specter::TextView");
|
||||
|
||||
#if BOO_HAS_GL
|
||||
static const char* GLSLVS =
|
||||
"#version 330\n"
|
||||
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::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if _WIN32
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@ namespace specter
|
|||
{
|
||||
static logvisor::Module Log("specter::View");
|
||||
|
||||
#if BOO_HAS_GL
|
||||
static const char* GLSLSolidVS =
|
||||
"#version 330\n"
|
||||
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::CullMode::None);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if _WIN32
|
||||
|
||||
|
|
|
@ -22,9 +22,11 @@ void ViewResources::init(boo::IGraphicsDataFactory* factory, FontCache* fcache,
|
|||
{
|
||||
switch (ctx.platform())
|
||||
{
|
||||
#if BOO_HAS_GL
|
||||
case boo::IGraphicsDataFactory::Platform::OpenGL:
|
||||
init<boo::GLDataFactory::Context>(static_cast<boo::GLDataFactory::Context&>(ctx), *theme, fcache);
|
||||
break;
|
||||
#endif
|
||||
#if _WIN32
|
||||
case boo::IGraphicsDataFactory::Platform::D3D11:
|
||||
case boo::IGraphicsDataFactory::Platform::D3D12:
|
||||
|
|
Loading…
Reference in New Issue