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

shader tag update

This commit is contained in:
Jack Andersen 2016-04-01 17:34:41 -10:00
parent 58c85d8c30
commit 4ab2312d06
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataSpec/DNACommon/TXTR.cpp
View File

@ -675,14 +675,12 @@ bool TXTR::CookPC(const hecl::ProjectPath& inPath, const hecl::ProjectPath& outP
mipmap = false; mipmap = false;
/* Compute mipmap levels */ /* Compute mipmap levels */
size_t numMips = 0; size_t numMips = 1;
if (mipmap && CountBits(width) == 1 && CountBits(height) == 1) if (mipmap && CountBits(width) == 1 && CountBits(height) == 1)
{ {
size_t index = std::min(width, height); size_t index = std::min(width, height);
while (index >>= 1) ++numMips; while (index >>= 1) ++numMips;
} }
else
numMips = 1;
if (bitDepth != 8) if (bitDepth != 8)
{ {

2
Runtime/Graphics/CModelBoo.cpp
View File

@ -376,7 +376,7 @@ CModel::CModel(std::unique_ptr<u8[]>&& in, u32 dataLen, IObjectStore* store)
{ {
hecl::Runtime::ShaderTag tag(mat.heclIr, hecl::Runtime::ShaderTag tag(mat.heclIr,
hmdlMeta.colorCount, hmdlMeta.uvCount, hmdlMeta.weightCount, hmdlMeta.colorCount, hmdlMeta.uvCount, hmdlMeta.weightCount,
0, mat.uvAnims.size(), true, true, true); 0, mat.uvAnims.size(), boo::Primitive(hmdlMeta.topology), true, true, true);
matSet.m_shaders.push_back(CGraphics::g_ShaderCacheMgr->buildShader(tag, mat.heclIr, "CMDL", ctx)); matSet.m_shaders.push_back(CGraphics::g_ShaderCacheMgr->buildShader(tag, mat.heclIr, "CMDL", ctx));
} }
} }

2
hecl

@ -1 +1 @@
Subproject commit 35db2400e471e01014808e51730c091562055035 Subproject commit e959430ebda4f94eb421fb9bbf4f5304c08be84e