AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-14 07:36:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

OS X enum refactor fixes

Browse Source
This commit is contained in:
Jack Andersen
2015-11-20 16:16:15 -10:00
parent c9edf8dd85
commit d040e20096
8 changed files with 112 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/main.cpp
View File

@@ -339,8 +339,8 @@ struct TestApplicationCallback : IApplicationCallback
pipeline = d3dF->newShaderPipeline(VS, PS, vsCompile, psCompile, cachedPipeline, vfmt,
BlendFactorOne, BlendFactorZero, true, true, false);
}
#elif __APPLE__
else if (factory->platform() == IGraphicsDataFactory::PlatformMetal)
#elif BOO_HAS_METAL
else if (factory->platform() == IGraphicsDataFactory::Platform::Metal)
{
MetalDataFactory* metalF = dynamic_cast<MetalDataFactory*>(factory);
@@ -368,12 +368,10 @@ struct TestApplicationCallback : IApplicationCallback
"}\n";
pipeline = metalF->newShaderPipeline(VS, FS, vfmt, self->m_renderTarget,
BlendFactorOne, BlendFactorZero, true, true, false);
BlendFactor::One, BlendFactor::Zero, true, true, false);
}
#endif
/* Make shader data binding */
self->m_binding =
factory->newShaderDataBinding(pipeline, vfmt, vbo, nullptr, 0, nullptr, 1, &texture);
@@ -388,12 +386,10 @@ struct TestApplicationCallback : IApplicationCallback
/* Wait for exit */
while (self->running)
{
{
std::unique_lock<std::mutex> lk(self->m_mt);
self->m_cv.wait(lk);
if (!self->running)
break;
}
std::unique_lock<std::mutex> lk(self->m_mt);
self->m_cv.wait(lk);
if (!self->running)
break;
}
}