AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:44:56 +00:00
Code Issues Projects Releases Wiki Activity

Per-stage shader hashing

Browse Source
This commit is contained in:
Jack Andersen
2019-06-05 14:07:50 -10:00
parent 5e60131062
commit b7aa3e06d2
10 changed files with 134 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Shaders/shader_CFluidPlaneShader.hpp
View File

@@ -66,7 +66,7 @@ public:
const boo::AdditionalPipelineInfo PipelineInfo;
bool HasTessellation;
static constexpr bool HasHash = false;
static constexpr uint64_t Hash() { return 0; }
static constexpr bool HasStageHash = false;
const SFluidPlaneShaderInfo& info() const { return m_info; }
};
@@ -93,7 +93,7 @@ public:
const boo::VertexFormatInfo VtxFmt;
const boo::AdditionalPipelineInfo PipelineInfo;
static constexpr bool HasHash = false;
static constexpr uint64_t Hash() { return 0; }
static constexpr bool HasStageHash = false;
const SFluidPlaneDoorShaderInfo& info() const { return m_info; }
};

9
Shaders/shader_CModelShaders.hpp
View File

@@ -32,9 +32,14 @@ struct SModelShadersInfo {
class Shader_CModelShaders : public hecl::GeneralShader {
const SModelShadersInfo& m_info;
uint64_t m_vertHash, m_fragHash;
static uint64_t BuildVertHash(const SModelShadersInfo& in);
static uint64_t BuildFragHash(const SModelShadersInfo& in);
public:
Shader_CModelShaders(const SModelShadersInfo& in)
: m_info(in)
, m_vertHash(BuildVertHash(in))
, m_fragHash(BuildFragHash(in))
, VtxFmt(in.m_vtxFmt)
, PipelineInfo(in.m_additionalInfo) {}
@@ -42,8 +47,12 @@ public:
const boo::AdditionalPipelineInfo PipelineInfo;
static constexpr bool HasHash = true;
uint64_t Hash() const { return m_info.m_hash; }
static constexpr bool HasStageHash = true;
template <typename S> uint64_t StageHash() const;
const SModelShadersInfo& info() const { return m_info; }
};
template <> inline uint64_t Shader_CModelShaders::StageHash<hecl::PipelineStage::Vertex>() const { return m_vertHash; }
template <> inline uint64_t Shader_CModelShaders::StageHash<hecl::PipelineStage::Fragment>() const { return m_fragHash; }
template <typename P, typename S>
class StageObject_CModelShaders : public hecl::StageBinary<P, S> {

56
Shaders/shader_CModelShadersGLSL.cpp
View File

@@ -141,6 +141,39 @@ static std::string _BuildVS(const SModelShadersInfo& info) {
return vertOut.str();
}
template <typename T>
static void _Hash(XXH64_state_t& st, T val) {
XXH64_update(&st, &val, sizeof(val));
}
uint64_t Shader_CModelShaders::BuildVertHash(const SModelShadersInfo& info) {
XXH64_state_t st;
XXH64_reset(&st, 0);
_Hash(st, info.m_tag.getColorCount());
_Hash(st, info.m_tag.getUvCount());
_Hash(st, info.m_tag.getSkinSlotCount());
_Hash(st, info.m_tag.getWeightCount());
for (const auto& chunk : info.m_material.chunks) {
if (auto passChunk = chunk.get_if<SModelShadersInfo::Material::PASS>()) {
_Hash(st, passChunk->type);
_Hash(st, passChunk->uvAnimType);
_Hash(st, passChunk->source);
_Hash(st, passChunk->shouldNormalizeUv());
} else if (auto clrChunk = chunk.get_if<SModelShadersInfo::Material::CLR>()) {
_Hash(st, clrChunk->type);
}
}
_Hash(st, info.m_extension.noReflection);
_Hash(st, info.m_tag.getReflectionType());
for (size_t i = 0; i < info.m_extension.texCount; ++i) {
const auto& extTex = info.m_extension.texs[i];
_Hash(st, extTex.mtxIdx);
_Hash(st, extTex.src);
_Hash(st, extTex.normalize);
}
return XXH64_digest(&st);
}
static std::string _BuildFS(const SModelShadersInfo& info) {
std::stringstream fragOut;
fragOut << CMODELSHADERS_COMMON_GLSL_SV;
@@ -197,6 +230,29 @@ static std::string _BuildFS(const SModelShadersInfo& info) {
return fragOut.str();
}
uint64_t Shader_CModelShaders::BuildFragHash(const SModelShadersInfo& info) {
XXH64_state_t st;
XXH64_reset(&st, 0);
XXH64_update(&st, info.m_extension.shaderMacro, strlen(info.m_extension.shaderMacro));
_Hash(st, info.m_material.shaderType);
_Hash(st, info.m_additionalInfo.srcFac);
_Hash(st, info.m_additionalInfo.dstFac);
for (const auto& chunk : info.m_material.chunks) {
if (auto passChunk = chunk.get_if<SModelShadersInfo::Material::PASS>()) {
_Hash(st, passChunk->alpha);
_Hash(st, passChunk->type);
} else if (auto clrChunk = chunk.get_if<SModelShadersInfo::Material::CLR>()) {
_Hash(st, clrChunk->type);
}
}
_Hash(st, info.m_tag.getAlphaTest());
_Hash(st, info.m_extension.forceAlphaTest);
_Hash(st, info.m_extension.diffuseOnly);
_Hash(st, info.m_extension.noReflection);
_Hash(st, info.m_tag.getReflectionType());
return XXH64_digest(&st);
}
template <>
std::string StageObject_CModelShaders<hecl::PlatformType::OpenGL, hecl::PipelineStage::Vertex>::BuildShader(
const SModelShadersInfo& in) {