AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

OpenGL enum change; Metal <10.11 fixes

This commit is contained in:
Jack Andersen 2016-08-23 18:35:35 -10:00
parent 92bb6fcb55
commit f95d6c8ada
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Graphics/CGraphics.cpp
View File

@ -191,7 +191,7 @@ zeus::CMatrix4f CGraphics::CalculatePerspectiveMatrix(float fovy, float aspect,
switch (g_BooPlatform)
{
case boo::IGraphicsDataFactory::Platform::OGL:
case boo::IGraphicsDataFactory::Platform::OpenGL:
default:
{
return zeus::CMatrix4f(2.f * st.x14_near / rml, 0.f, rpl / rml, 0.f,
@ -239,7 +239,7 @@ zeus::CMatrix4f CGraphics::GetPerspectiveProjectionMatrix(bool forRenderer)
switch (g_BooPlatform)
{
case boo::IGraphicsDataFactory::Platform::OGL:
case boo::IGraphicsDataFactory::Platform::OpenGL:
default:
{
return zeus::CMatrix4f(2.f * g_Proj.x14_near / rml, 0.f, rpl / rml, 0.f,

2
Runtime/Graphics/CMakeLists.txt
View File

@ -9,7 +9,7 @@ if(WIN32)
Shaders/CSpaceWarpFilterHLSL.cpp
Shaders/CCameraBlurFilterHLSL.cpp
Shaders/CXRayBlurFilterHLSL.cpp)
elseif(APPLE)
elseif(BOO_HAS_METAL)
set(PLAT_SRCS
Shaders/CLineRendererShadersMetal.cpp
Shaders/CTexturedQuadFilterMetal.cpp

2
Runtime/Graphics/CMoviePlayer.cpp
View File

@ -210,7 +210,7 @@ void CMoviePlayer::Initialize()
switch (ctx.platform())
{
case boo::IGraphicsDataFactory::Platform::OGL:
case boo::IGraphicsDataFactory::Platform::OpenGL:
YUVShaderPipeline = static_cast<boo::GLDataFactory::Context&>(ctx).newShaderPipeline
(VS_GLSL_YUV, FS_GLSL_YUV, 3, TexNames, 1, BlockNames,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,

2
Runtime/Graphics/Shaders/CLineRendererShaders.cpp
View File

@ -25,7 +25,7 @@ void CLineRendererShaders::Initialize()
{
switch (ctx.platform())
{
case boo::IGraphicsDataFactory::Platform::OGL:
case boo::IGraphicsDataFactory::Platform::OpenGL:
m_bindFactory.reset(Initialize(static_cast<boo::GLDataFactory::Context&>(ctx)));
break;
#if _WIN32

2
Runtime/Graphics/Shaders/CModelShaders.cpp
View File

@ -10,7 +10,7 @@ CModelShaders::GetShaderExtensions(boo::IGraphicsDataFactory::Platform plat)
{
switch (plat)
{
case boo::IGraphicsDataFactory::Platform::OGL:
case boo::IGraphicsDataFactory::Platform::OpenGL:
case boo::IGraphicsDataFactory::Platform::Vulkan:
return GetShaderExtensionsGLSL(plat);
#if _WIN32

2
Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp
View File

@ -118,7 +118,7 @@ void CSpaceWarpFilter::draw(const zeus::CVector3f& pt)
m_uniform.m_matrix[1][1] = clipRect.x10_height / vp.y;
m_uniform.m_matrix[3][0] = pt.x + (1.f / vp.x);
m_uniform.m_matrix[3][1] = pt.y + (1.f / vp.y);
if (CGraphics::g_BooPlatform == boo::IGraphicsDataFactory::Platform::OGL)
if (CGraphics::g_BooPlatform == boo::IGraphicsDataFactory::Platform::OpenGL)
m_uniform.m_matrix[3][2] = pt.z * 2.f - 1.f;
else
m_uniform.m_matrix[3][2] = pt.z;

2
Runtime/Graphics/Shaders/TMultiBlendShader.hpp
View File

@ -41,7 +41,7 @@ public:
{
switch (ctx.platform())
{
case boo::IGraphicsDataFactory::Platform::OGL:
case boo::IGraphicsDataFactory::Platform::OpenGL:
m_bindFactory.reset(FilterImp::Initialize(static_cast<boo::GLDataFactory::Context&>(ctx),
m_alphaBlendPipeline, m_additiveAlphaPipeline, m_colorMultiplyPipeline));
break;

2
Runtime/Graphics/Shaders/TShader.hpp
View File

@ -38,7 +38,7 @@ public:
{
switch (ctx.platform())
{
case boo::IGraphicsDataFactory::Platform::OGL:
case boo::IGraphicsDataFactory::Platform::OpenGL:
m_bindFactory.reset(FilterImp::Initialize(static_cast<boo::GLDataFactory::Context&>(ctx),
m_pipeline));
break;

2
Runtime/Particle/CElementGen.cpp
View File

@ -180,7 +180,7 @@ void CElementGenShaders::Initialize()
{
switch (ctx.platform())
{
case boo::IGraphicsDataFactory::Platform::OGL:
case boo::IGraphicsDataFactory::Platform::OpenGL:
m_bindFactory.reset(Initialize(static_cast<boo::GLDataFactory::Context&>(ctx)));
break;
#if _WIN32

2
Runtime/Particle/CMakeLists.txt
View File

@ -1,6 +1,6 @@
if(WIN32)
set(PLAT_SRCS CElementGenShadersHLSL.cpp)
elseif(APPLE)
elseif(BOO_HAS_METAL)
set(PLAT_SRCS CElementGenShadersMetal.cpp)
endif()

2
hecl

@ -1 +1 @@
Subproject commit 9b9dae61566460086a51ccf371fc1bdf682ee5cb
Subproject commit 0753c01b3c6a0a8db4b390cdc4553e5c047525c9

2
specter

@ -1 +1 @@
Subproject commit 4c675e2e0512c911b76da84b0073396392c7f3a3
Subproject commit 948602e8c5852e70d6598e09b603983c91fb07ca