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

Merge branch 'master' of https://github.com/AxioDL/hecl

This commit is contained in:
Jack Andersen 2016-04-05 15:43:35 -10:00
parent bbaf33e4de 2fbc21cc18
commit b5f2b13832
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/boo vendored

@ -1 +1 @@
Subproject commit 4cec163804dd293818029d838dda512c7b985aaf Subproject commit 5afdb62a392eaf8ae41e09b9dd37b7922abd03b5

1
hecl/lib/Backend/Metal.cpp
View File

@ -370,7 +370,6 @@ struct MetalBackendFactory : IShaderBackendFactory
for (const ShaderCacheExtensions::ExtensionSlot& slot : extensionSlots) for (const ShaderCacheExtensions::ExtensionSlot& slot : extensionSlots)
{ {
fragSources.push_back(m_backend.makeFrag(slot.blockCount, slot.blockNames, slot.lighting, slot.post)); fragSources.push_back(m_backend.makeFrag(slot.blockCount, slot.blockNames, slot.lighting, slot.post));
fprintf(stderr, "%s\n", fragSources.back().c_str());
cachedSz += fragSources.back().size() + 1; cachedSz += fragSources.back().size() + 1;
boo::IShaderPipeline* ret = boo::IShaderPipeline* ret =
static_cast<boo::MetalDataFactory::Context&>(ctx). static_cast<boo::MetalDataFactory::Context&>(ctx).