2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-20 21:39:12 +00:00

Vulkan sync

This commit is contained in:
Jack Andersen
2016-03-23 22:15:55 -10:00
parent a09d042a3d
commit bb0ca46194
2 changed files with 5 additions and 5 deletions

2
hecl/extern/boo vendored

Submodule hecl/extern/boo updated: 6600ff208c...4d33cec75c

View File

@@ -422,7 +422,7 @@ struct SPIRVBackendFactory : IShaderBackendFactory
objOut = objOut =
m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(), m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(),
vertBlob, fragBlob, pipelineBlob, tag.newVertexFormat(m_gfxFactory), vertBlob, fragBlob, pipelineBlob, tag.newVertexFormat(m_gfxFactory),
m_backend.m_blendSrc, m_backend.m_blendDst, m_backend.m_blendSrc, m_backend.m_blendDst, boo::Primitive::TriStrips,
tag.getDepthTest(), tag.getDepthWrite(), tag.getDepthTest(), tag.getDepthWrite(),
tag.getBackfaceCulling()); tag.getBackfaceCulling());
if (!objOut) if (!objOut)
@@ -495,7 +495,7 @@ struct SPIRVBackendFactory : IShaderBackendFactory
m_gfxFactory->newShaderPipeline(nullptr, nullptr, m_gfxFactory->newShaderPipeline(nullptr, nullptr,
vertBlob, fragBlob, pipelineBlob, vertBlob, fragBlob, pipelineBlob,
tag.newVertexFormat(m_gfxFactory), tag.newVertexFormat(m_gfxFactory),
blendSrc, blendDst, blendSrc, blendDst, boo::Primitive::TriStrips,
tag.getDepthTest(), tag.getDepthWrite(), tag.getDepthTest(), tag.getDepthWrite(),
tag.getBackfaceCulling()); tag.getBackfaceCulling());
if (!ret) if (!ret)
@@ -530,7 +530,7 @@ struct SPIRVBackendFactory : IShaderBackendFactory
m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(), m_gfxFactory->newShaderPipeline(vertSource.c_str(), fragSource.c_str(),
vertBlob, fragPipeBlob.first, fragPipeBlob.second, vertBlob, fragPipeBlob.first, fragPipeBlob.second,
tag.newVertexFormat(m_gfxFactory), tag.newVertexFormat(m_gfxFactory),
m_backend.m_blendSrc, m_backend.m_blendDst, m_backend.m_blendSrc, m_backend.m_blendDst, boo::Primitive::TriStrips,
tag.getDepthTest(), tag.getDepthWrite(), tag.getDepthTest(), tag.getDepthWrite(),
tag.getBackfaceCulling()); tag.getBackfaceCulling());
if (!ret) if (!ret)
@@ -612,7 +612,7 @@ struct SPIRVBackendFactory : IShaderBackendFactory
m_gfxFactory->newShaderPipeline(nullptr, nullptr, m_gfxFactory->newShaderPipeline(nullptr, nullptr,
vertBlob, fragBlob, pipelineBlob, vertBlob, fragBlob, pipelineBlob,
tag.newVertexFormat(m_gfxFactory), tag.newVertexFormat(m_gfxFactory),
blendSrc, blendDst, blendSrc, blendDst, boo::Primitive::TriStrips,
tag.getDepthTest(), tag.getDepthWrite(), tag.getDepthTest(), tag.getDepthWrite(),
tag.getBackfaceCulling()); tag.getBackfaceCulling());
if (!ret) if (!ret)