From 4ab2312d06af03a819a79f1844cf2713e5fafb51 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Fri, 1 Apr 2016 17:34:41 -1000 Subject: [PATCH] shader tag update --- DataSpec/DNACommon/TXTR.cpp | 4 +--- Runtime/Graphics/CModelBoo.cpp | 2 +- hecl | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/DataSpec/DNACommon/TXTR.cpp b/DataSpec/DNACommon/TXTR.cpp index 2f587abdf..174e65376 100644 --- a/DataSpec/DNACommon/TXTR.cpp +++ b/DataSpec/DNACommon/TXTR.cpp @@ -675,14 +675,12 @@ bool TXTR::CookPC(const hecl::ProjectPath& inPath, const hecl::ProjectPath& outP mipmap = false; /* Compute mipmap levels */ - size_t numMips = 0; + size_t numMips = 1; if (mipmap && CountBits(width) == 1 && CountBits(height) == 1) { size_t index = std::min(width, height); while (index >>= 1) ++numMips; } - else - numMips = 1; if (bitDepth != 8) { diff --git a/Runtime/Graphics/CModelBoo.cpp b/Runtime/Graphics/CModelBoo.cpp index 8dfbd98e1..cc7693821 100644 --- a/Runtime/Graphics/CModelBoo.cpp +++ b/Runtime/Graphics/CModelBoo.cpp @@ -376,7 +376,7 @@ CModel::CModel(std::unique_ptr&& in, u32 dataLen, IObjectStore* store) { hecl::Runtime::ShaderTag tag(mat.heclIr, 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)); } } diff --git a/hecl b/hecl index 35db2400e..e959430eb 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 35db2400e471e01014808e51730c091562055035 +Subproject commit e959430ebda4f94eb421fb9bbf4f5304c08be84e