AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-17 14:31:21 +00:00
Code Issues Projects Releases Wiki Activity

OS X enum refactor fixes

Browse Source
This commit is contained in:
Jack Andersen 2015-11-20 16:16:54 -10:00
parent 0a457d854a
commit c4f8743bf6
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/libBoo vendored

@ -1 +1 @@
Subproject commit c9edf8dd8573662921522d40cdd38837f7db2154 Subproject commit d040e20096d50d0f8af623f4d2bb05f5e5b0ba73

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

@ -16,11 +16,11 @@ std::string Metal::EmitTexGenSource2(TexGenSrc src, int uvIdx) const
{ {
switch (src) switch (src)
{ {
case TG_POS: case TexGenSrc::Position:
return "v.posIn.xy\n"; return "v.posIn.xy\n";
case TG_NRM: case TexGenSrc::Normal:
return "v.normIn.xy\n"; return "v.normIn.xy\n";
case TG_UV: case TexGenSrc::UV:
return HECL::Format("v.uvIn%u", uvIdx); return HECL::Format("v.uvIn%u", uvIdx);
default: break; default: break;
} }
@ -31,11 +31,11 @@ std::string Metal::EmitTexGenSource4(TexGenSrc src, int uvIdx) const
{ {
switch (src) switch (src)
{ {
case TG_POS: case TexGenSrc::Position:
return "float4(v.posIn, 1.0)\n"; return "float4(v.posIn, 1.0)\n";
case TG_NRM: case TexGenSrc::Normal:
return "float4(v.normIn, 1.0)\n"; return "float4(v.normIn, 1.0)\n";
case TG_UV: case TexGenSrc::UV:
return HECL::Format("float4(v.uvIn%u, 0.0, 1.0)", uvIdx); return HECL::Format("float4(v.uvIn%u, 0.0, 1.0)", uvIdx);
default: break; default: break;
} }
@ -290,8 +290,8 @@ struct MetalBackendFactory : IShaderBackendFactory
ShaderCachedData dataOut(tag, cachedSz); ShaderCachedData dataOut(tag, cachedSz);
Athena::io::MemoryWriter w(dataOut.m_data.get(), dataOut.m_sz); Athena::io::MemoryWriter w(dataOut.m_data.get(), dataOut.m_sz);
w.writeUByte(m_backend.m_blendSrc); w.writeUByte(atUint8(m_backend.m_blendSrc));
w.writeUByte(m_backend.m_blendDst); w.writeUByte(atUint8(m_backend.m_blendDst));
w.writeString(vertSource); w.writeString(vertSource);
w.writeString(fragSource); w.writeString(fragSource);
@ -358,8 +358,8 @@ struct MetalBackendFactory : IShaderBackendFactory
ShaderCachedData dataOut(tag, cachedSz); ShaderCachedData dataOut(tag, cachedSz);
Athena::io::MemoryWriter w(dataOut.m_data.get(), dataOut.m_sz); Athena::io::MemoryWriter w(dataOut.m_data.get(), dataOut.m_sz);
w.writeUByte(m_backend.m_blendSrc); w.writeUByte(atUint8(m_backend.m_blendSrc));
w.writeUByte(m_backend.m_blendDst); w.writeUByte(atUint8(m_backend.m_blendDst));
w.writeString(vertSource); w.writeString(vertSource);
for (const std::string src : fragSources) for (const std::string src : fragSources)
w.writeString(src); w.writeString(src);

2
hecl/lib/Runtime/ShaderCacheManager.cpp
View File

@ -123,7 +123,7 @@ ShaderCacheManager::ShaderCacheManager(const FileStoreManager& storeMgr,
m_factory.reset(_NewHLSLBackendFactory(gfxFactory)); m_factory.reset(_NewHLSLBackendFactory(gfxFactory));
break; break;
#elif __APPLE__ && HECL_HAS_METAL #elif __APPLE__ && HECL_HAS_METAL
case boo::IGraphicsDataFactory::PlatformMetal: case boo::IGraphicsDataFactory::Platform::Metal:
m_factory.reset(_NewMetalBackendFactory(gfxFactory)); m_factory.reset(_NewMetalBackendFactory(gfxFactory));
break; break;
#endif #endif