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

Fix CInputGenerator, CRadarPaintShaderGLSL and CPhazonSuitFilterGLSL crashes

This commit is contained in:
Phillip Stephens 2017-05-09 17:03:20 -07:00
parent e798fe49b4
commit c70a0d81cb
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ static const char* BlurVS =
"#version 330\n" "#version 330\n"
BOO_GLSL_BINDING_HEAD BOO_GLSL_BINDING_HEAD
"layout(location=0) in vec4 posIn;\n" "layout(location=0) in vec4 posIn;\n"
"layout(location=3) in vec4 uvIn;\n" "layout(location=1) in vec4 uvIn;\n"
"\n" "\n"
"UBINDING0 uniform PhazonSuitBlurUniform\n" "UBINDING0 uniform PhazonSuitBlurUniform\n"
"{\n" "{\n"

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

@ -126,7 +126,7 @@ CRadarPaintShader::Initialize(boo::VulkanDataFactory::Context& ctx)
{nullptr, nullptr, boo::VertexSemantic::UV4, 3}, {nullptr, nullptr, boo::VertexSemantic::UV4, 3},
{nullptr, nullptr, boo::VertexSemantic::Color} {nullptr, nullptr, boo::VertexSemantic::Color}
}; };
s_VtxFmt = ctx.newVertexFormat(2, VtxVmt); s_VtxFmt = ctx.newVertexFormat(9, VtxVmt);
s_Pipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha, s_Pipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha,
boo::BlendFactor::One, boo::Primitive::TriStrips, boo::BlendFactor::One, boo::Primitive::TriStrips,
boo::ZTest::None, false, true, false, boo::CullMode::None); boo::ZTest::None, false, true, false, boo::CullMode::None);

3
Runtime/Input/CInputGenerator.hpp
View File

@ -179,7 +179,8 @@ public:
if (!smashAdapter) if (!smashAdapter)
{ {
smashAdapter = std::dynamic_pointer_cast<boo::DolphinSmashAdapter>(tok.openAndGetDevice()); smashAdapter = std::dynamic_pointer_cast<boo::DolphinSmashAdapter>(tok.openAndGetDevice());
smashAdapter->setCallback(&m_dolphinCb); if (smashAdapter)
smashAdapter->setCallback(&m_dolphinCb);
} }
} }
void deviceDisconnected(boo::DeviceToken&, boo::DeviceBase* device) void deviceDisconnected(boo::DeviceToken&, boo::DeviceBase* device)

2
Runtime/MP1/World/CActorContraption.cpp
View File

@ -36,7 +36,7 @@ void MP1::CActorContraption::Think(float dt, CStateManager& mgr)
if (act && act->GetActive()) if (act && act->GetActive())
{ {
act->SetTransform(act->GetScaledLocatorTransform(uid.second)); act->SetTransform(x34_transform * act->GetScaledLocatorTransform(uid.second));
} }
} }
} }

2
hecl

@ -1 +1 @@
Subproject commit 104d554f42102390ddcc52fe50832097b78c6c08 Subproject commit b25f7f30026b51ae5f3025efbade3d88c933dbe0