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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/boo vendored

@ -1 +1 @@
Subproject commit 6600ff208cad0f506cde16ac26cdc86b4d9d7070 Subproject commit 4d33cec75c3d74fefe6c76ba133d6c0b3648223a

8
hecl/lib/Backend/GLSL.cpp
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)