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

Windows compile fixes

This commit is contained in:
Jack Andersen 2017-09-30 19:32:37 -10:00
parent 8cdaf74711
commit a84f5441a7
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ void CWorldShadowShader::blendPreviousShadow()
void CWorldShadowShader::resolveTexture() void CWorldShadowShader::resolveTexture()
{ {
boo::SWindowRect rect = {0, 0, m_w, m_h}; boo::SWindowRect rect = {0, 0, int(m_w), int(m_h)};
CGraphics::g_BooMainCommandQueue->resolveBindTexture(m_tex, rect, false, 0, true, false); CGraphics::g_BooMainCommandQueue->resolveBindTexture(m_tex, rect, false, 0, true, false);
} }

8
Runtime/Graphics/Shaders/CWorldShadowShader.hpp
View File

@ -10,10 +10,10 @@ namespace urde
class CWorldShadowShader class CWorldShadowShader
{ {
friend class CWorldShadowShaderGLDataBindingFactory; friend struct CWorldShadowShaderGLDataBindingFactory;
friend class CWorldShadowShaderVulkanDataBindingFactory; friend struct CWorldShadowShaderVulkanDataBindingFactory;
friend class CWorldShadowShaderD3DDataBindingFactory; friend struct CWorldShadowShaderD3DDataBindingFactory;
friend class CWorldShadowShaderMetalDataBindingFactory; friend struct CWorldShadowShaderMetalDataBindingFactory;
boo::ITextureR* m_tex; boo::ITextureR* m_tex;
std::experimental::optional<CTexturedQuadFilter> m_prevQuad; std::experimental::optional<CTexturedQuadFilter> m_prevQuad;

10
Runtime/Graphics/Shaders/CWorldShadowShaderHLSL.cpp
View File

@ -55,12 +55,10 @@ struct CWorldShadowShaderD3DDataBindingFactory : TShader<CWorldShadowShader>::ID
boo::ID3DDataFactory::Context& cctx = static_cast<boo::ID3DDataFactory::Context&>(ctx); boo::ID3DDataFactory::Context& cctx = static_cast<boo::ID3DDataFactory::Context&>(ctx);
boo::IGraphicsBuffer* bufs[] = {filter.m_uniBuf}; boo::IGraphicsBuffer* bufs[] = {filter.m_uniBuf};
filter.m_dataBind = cctx.newShaderDataBinding(s_Pipeline, filter.m_dataBind = cctx.newShaderDataBinding(s_Pipeline, s_VtxFmt,
nullptr, nullptr, nullptr, s_VtxFmt,
filter.m_vbo, nullptr, nullptr, 1, bufs, filter.m_vbo, nullptr, nullptr, 1, bufs,
nullptr, nullptr, nullptr, 0, nullptr, nullptr, nullptr); nullptr, nullptr, nullptr, 0, nullptr, nullptr, nullptr);
filter.m_zDataBind = cctx.newShaderDataBinding(s_ZPipeline, filter.m_zDataBind = cctx.newShaderDataBinding(s_ZPipeline, s_VtxFmt,
nullptr, nullptr, nullptr, s_VtxFmt,
filter.m_vbo, nullptr, nullptr, 1, bufs, filter.m_vbo, nullptr, nullptr, 1, bufs,
nullptr, nullptr, nullptr, 0, nullptr, nullptr, nullptr); nullptr, nullptr, nullptr, 0, nullptr, nullptr, nullptr);
filter._buildTex(ctx); filter._buildTex(ctx);
@ -76,10 +74,10 @@ CWorldShadowShader::Initialize(boo::ID3DDataFactory::Context& ctx)
{nullptr, nullptr, boo::VertexSemantic::Position4} {nullptr, nullptr, boo::VertexSemantic::Position4}
}; };
s_VtxFmt = ctx.newVertexFormat(1, VtxVmt); s_VtxFmt = ctx.newVertexFormat(1, VtxVmt);
s_Pipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha, s_Pipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr, s_VtxFmt, boo::BlendFactor::SrcAlpha,
boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips, boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips,
boo::ZTest::None, false, true, false, boo::CullMode::None); boo::ZTest::None, false, true, false, boo::CullMode::None);
s_ZPipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha, s_ZPipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr, s_VtxFmt, boo::BlendFactor::SrcAlpha,
boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips, boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips,
boo::ZTest::LEqual, true, true, false, boo::CullMode::None); boo::ZTest::LEqual, true, true, false, boo::CullMode::None);
return new CWorldShadowShaderD3DDataBindingFactory; return new CWorldShadowShaderD3DDataBindingFactory;

2
amuse

@ -1 +1 @@
Subproject commit fdf07d6c332d6d5125c4e32bddec839fa7fa3c05 Subproject commit 047a91452e20bdf3fd4dd96b92ec8baa41beac47

2
hecl

@ -1 +1 @@
Subproject commit 6f86b576ed28e44740c65aaeb330b58ef6b06b13 Subproject commit 2ff1ff22b3ba5ef8c89de1faea6c992ad4542952