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

CDecalShaders: Convert to hsh pipeline

This commit is contained in:
Luke Street 2020-09-29 05:54:12 -04:00
parent 31bb006976
commit 2d786e4318
5 changed files with 107 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Runtime/Graphics/CMakeLists.txt
View File

@ -57,4 +57,5 @@ runtime_add_hsh(Graphics
Shaders/CFogVolumePlaneShader.cpp Shaders/CFogVolumePlaneShader.cpp
Shaders/CAABoxShader.cpp Shaders/CAABoxShader.cpp
Shaders/CColoredStripShader.cpp Shaders/CColoredStripShader.cpp
Shaders/CDecalShaders.cpp
) )

92
Runtime/Graphics/Shaders/CDecalShaders.cpp
View File

@ -4,69 +4,51 @@
#include "Runtime/Particle/CDecal.hpp" #include "Runtime/Particle/CDecal.hpp"
#include <hecl/Pipeline.hpp> #include "CDecalShaders.cpp.hshhead"
namespace urde { namespace urde {
using namespace hsh::pipeline;
void CDecalShaders::Initialize() { template <bool Additive, bool RedToAlpha>
m_texZTestNoZWrite = hecl::conv->convert(Shader_CDecalShaderTexZTest{}); struct CDecalShaderTexPipeline
m_texAdditiveZTest = hecl::conv->convert(Shader_CDecalShaderTexAdditiveZTest{}); : pipeline<std::conditional_t<Additive, std::conditional_t<RedToAlpha, MultiplyAttachment<>, AdditiveAttachment<>>,
m_texRedToAlphaZTest = hecl::conv->convert(Shader_CDecalShaderTexRedToAlphaZTest{}); BlendAttachment<>>,
m_noTexZTestNoZWrite = hecl::conv->convert(Shader_CDecalShaderNoTexZTest{}); depth_compare<hsh::LEqual>, depth_write<false>> {
m_noTexAdditiveZTest = hecl::conv->convert(Shader_CDecalShaderNoTexAdditiveZTest{}); CDecalShaderTexPipeline(hsh::vertex_buffer<SParticleInstanceTex> vbo, hsh::uniform_buffer<SParticleUniforms> uniBuf,
} hsh::texture2d tex) {
this->position = uniBuf->mvp * vbo->pos[this->vertex_id];
this->color_out[0] = vbo->color * uniBuf->moduColor * tex.sample<float>(vbo->uvs[this->vertex_id]);
if constexpr (RedToAlpha) {
this->color_out[0].w = this->color_out[0].x;
}
}
};
template struct CDecalShaderTexPipeline<true, true>;
template struct CDecalShaderTexPipeline<true, false>;
template struct CDecalShaderTexPipeline<false, false>;
void CDecalShaders::Shutdown() { template <bool Additive>
m_texZTestNoZWrite.reset(); struct CDecalShaderNoTexPipeline : pipeline<std::conditional_t<Additive, AdditiveAttachment<>, BlendAttachment<>>,
m_texAdditiveZTest.reset(); depth_compare<hsh::LEqual>, depth_write<!Additive>> {
m_texRedToAlphaZTest.reset(); CDecalShaderNoTexPipeline(hsh::vertex_buffer<SParticleInstanceTex> vbo,
m_noTexZTestNoZWrite.reset(); hsh::uniform_buffer<SParticleUniforms> uniBuf) {
m_noTexAdditiveZTest.reset(); this->position = uniBuf->mvp * vbo->pos[this->vertex_id];
} this->color_out[0] = vbo->color * uniBuf->moduColor;
}
void CDecalShaders::BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& ctx, CQuadDecal& decal) { };
boo::ObjToken<boo::IShaderPipeline> regPipeline; template struct CDecalShaderNoTexPipeline<true>;
boo::ObjToken<boo::IShaderPipeline> redToAlphaPipeline; template struct CDecalShaderNoTexPipeline<false>;
hsh::binding& CDecalShaders::BuildShaderDataBinding(CQuadDecal& decal, hsh::texture2d tex) {
bool additive = decal.m_desc->x18_ADD;
if (decal.m_desc->x14_TEX) { if (decal.m_desc->x14_TEX) {
if (decal.m_desc->x18_ADD) bool redToAlpha = additive && CDecal::GetMoveRedToAlphaBuffer();
regPipeline = m_texAdditiveZTest; m_dataBind.hsh_tex_bind(
else CDecalShaderTexPipeline<additive, redToAlpha>(decal.m_instBuf.get(), decal.m_uniformBuf.get(), tex));
regPipeline = m_texZTestNoZWrite;
redToAlphaPipeline = m_texRedToAlphaZTest;
} else { } else {
if (decal.m_desc->x18_ADD) m_dataBind.hsh_notex_bind(CDecalShaderNoTexPipeline<additive>(decal.m_instBuf.get(), decal.m_uniformBuf.get()));
regPipeline = m_noTexAdditiveZTest;
else
regPipeline = m_noTexZTestNoZWrite;
}
const SQuadDescr* const desc = decal.m_desc;
const CUVElement* const texr = desc->x14_TEX.get();
size_t texCount = 0;
std::array<boo::ObjToken<boo::ITexture>, 1> textures;
if (texr != nullptr) {
textures[0] = texr->GetValueTexture(0).GetObj()->GetBooTexture();
texCount = 1;
}
if (!decal.m_instBuf) {
return;
}
std::array<boo::ObjToken<boo::IGraphicsBuffer>, 1> uniforms{decal.m_uniformBuf.get()};
if (regPipeline) {
decal.m_normalDataBind =
ctx.newShaderDataBinding(regPipeline, nullptr, decal.m_instBuf.get(), nullptr, uniforms.size(), uniforms.data(),
nullptr, texCount, textures.data(), nullptr, nullptr);
}
if (redToAlphaPipeline) {
decal.m_redToAlphaDataBind =
ctx.newShaderDataBinding(redToAlphaPipeline, nullptr, decal.m_instBuf.get(), nullptr, uniforms.size(),
uniforms.data(), nullptr, texCount, textures.data(), nullptr, nullptr);
} }
return m_dataBind;
} }
} // namespace urde } // namespace urde

14
Runtime/Graphics/Shaders/CDecalShaders.hpp
View File

@ -1,23 +1,15 @@
#pragma once #pragma once
#include <boo/graphicsdev/IGraphicsDataFactory.hpp> #include "hsh/hsh.h"
namespace urde { namespace urde {
struct CQuadDecal; struct CQuadDecal;
class CDecalShaders { class CDecalShaders {
private: hsh::binding m_dataBind;
static inline boo::ObjToken<boo::IShaderPipeline> m_texZTestNoZWrite;
static inline boo::ObjToken<boo::IShaderPipeline> m_texAdditiveZTest;
static inline boo::ObjToken<boo::IShaderPipeline> m_texRedToAlphaZTest;
static inline boo::ObjToken<boo::IShaderPipeline> m_noTexZTestNoZWrite;
static inline boo::ObjToken<boo::IShaderPipeline> m_noTexAdditiveZTest;
public: public:
static void Initialize(); hsh::binding& BuildShaderDataBinding(CQuadDecal& decal, hsh::texture2d tex);
static void Shutdown();
static void BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& ctx, CQuadDecal& decal);
}; };
} // namespace urde } // namespace urde

118
Runtime/Particle/CDecal.cpp
View File

@ -1,7 +1,6 @@
#include "Runtime/Particle/CDecal.hpp" #include "Runtime/Particle/CDecal.hpp"
#include "Runtime/Graphics/CModel.hpp" #include "Runtime/Graphics/CModel.hpp"
#include "Runtime/Graphics/Shaders/CDecalShaders.hpp"
#include "Runtime/Particle/CParticleGlobals.hpp" #include "Runtime/Particle/CParticleGlobals.hpp"
namespace urde { namespace urde {
@ -18,38 +17,36 @@ CDecal::CDecal(const TToken<CDecalDescription>& desc, const zeus::CTransform& xf
CDecalDescription* d = x0_description.GetObj(); CDecalDescription* d = x0_description.GetObj();
if (d->x38_DMDL) { if (d->x38_DMDL) {
if (d->x48_DLFT) if (d->x48_DLFT) {
d->x48_DLFT->GetValue(0, x54_modelLifetime); d->x48_DLFT->GetValue(0, x54_modelLifetime);
else } else {
x54_modelLifetime = 0x7FFFFF; x54_modelLifetime = 0x7FFFFF;
}
if (d->x50_DMRT) if (d->x50_DMRT) {
d->x50_DMRT->GetValue(0, x60_rotation); d->x50_DMRT->GetValue(0, x60_rotation);
}
} else { } else {
x5c_29_modelInvalid = true; x5c_29_modelInvalid = true;
} }
CGraphics::CommitResources([this](boo::IGraphicsDataFactory::Context& ctx) {
for (auto& decal : x3c_decalQuads) {
if (decal.m_desc->x14_TEX) {
decal.m_instBuf = ctx.newDynamicBuffer(boo::BufferUse::Vertex, sizeof(SParticleInstanceTex), 1);
} else {
decal.m_instBuf = ctx.newDynamicBuffer(boo::BufferUse::Vertex, sizeof(SParticleInstanceNoTex), 1);
}
decal.m_uniformBuf = ctx.newDynamicBuffer(boo::BufferUse::Uniform, sizeof(SParticleUniforms), 1);
CDecalShaders::BuildShaderDataBinding(ctx, decal);
}
return true;
} BooTrace);
} }
bool CDecal::InitQuad(CQuadDecal& quad, const SQuadDescr& desc) { bool CDecal::InitQuad(CQuadDecal& quad, const SQuadDescr& desc) {
quad.m_desc = &desc; quad.m_desc = &desc;
if (desc.x14_TEX) { if (desc.x14_TEX) {
if (desc.x0_LFT) quad.m_instBuf = hsh::create_dynamic_vertex_buffer<SParticleInstanceTex>(1);
} else {
quad.m_instBuf = hsh::create_dynamic_vertex_buffer<SParticleInstanceNoTex>(1);
}
quad.m_uniformBuf = hsh::create_dynamic_uniform_buffer<SParticleUniforms>();
if (desc.x14_TEX) {
if (desc.x0_LFT) {
desc.x0_LFT->GetValue(0, quad.x4_lifetime); desc.x0_LFT->GetValue(0, quad.x4_lifetime);
else } else {
quad.x4_lifetime = 0x7FFFFF; quad.x4_lifetime = 0x7FFFFF;
}
if (desc.x8_ROT) { if (desc.x8_ROT) {
desc.x8_ROT->GetValue(0, quad.x8_rotation); desc.x8_ROT->GetValue(0, quad.x8_rotation);
quad.x0_24_invalid = desc.x8_ROT->IsConstant(); quad.x0_24_invalid = desc.x8_ROT->IsConstant();
@ -57,13 +54,16 @@ bool CDecal::InitQuad(CQuadDecal& quad, const SQuadDescr& desc) {
if (desc.x4_SZE) { if (desc.x4_SZE) {
quad.x0_24_invalid = desc.x4_SZE->IsConstant(); quad.x0_24_invalid = desc.x4_SZE->IsConstant();
float size = 1.f; if (!quad.x0_24_invalid) {
desc.x4_SZE->GetValue(0, size); float size = 1.f;
quad.x0_24_invalid = size <= 1.f; desc.x4_SZE->GetValue(0, size);
quad.x0_24_invalid = size <= 1.f;
}
} }
if (desc.xc_OFF) if (desc.xc_OFF) {
quad.x0_24_invalid = desc.xc_OFF->IsFastConstant(); quad.x0_24_invalid = desc.xc_OFF->IsFastConstant();
}
return false; return false;
} }
@ -75,18 +75,20 @@ void CDecal::SetGlobalSeed(u16 seed) { sDecalRandom.SetSeed(seed); }
void CDecal::SetMoveRedToAlphaBuffer(bool move) { sMoveRedToAlphaBuffer = move; } void CDecal::SetMoveRedToAlphaBuffer(bool move) { sMoveRedToAlphaBuffer = move; }
void CDecal::RenderQuad(CQuadDecal& decal, const SQuadDescr& desc) const { void CDecal::RenderQuad(CQuadDecal& decal, const SQuadDescr& desc) {
zeus::CColor color = zeus::skWhite; zeus::CColor color = zeus::skWhite;
float size = 1.f; float size = 1.f;
zeus::CVector3f offset; zeus::CVector3f offset;
if (CColorElement* clr = desc.x10_CLR.get()) if (CColorElement* clr = desc.x10_CLR.get()) {
clr->GetValue(x58_frameIdx, color); clr->GetValue(x58_frameIdx, color);
}
if (CRealElement* sze = desc.x4_SZE.get()) { if (CRealElement* sze = desc.x4_SZE.get()) {
sze->GetValue(x58_frameIdx, size); sze->GetValue(x58_frameIdx, size);
size *= 0.5f; size *= 0.5f;
} }
if (CRealElement* rot = desc.x8_ROT.get()) if (CRealElement* rot = desc.x8_ROT.get()) {
rot->GetValue(x58_frameIdx, decal.x8_rotation); rot->GetValue(x58_frameIdx, decal.x8_rotation);
}
if (CVectorElement* off = desc.xc_OFF.get()) { if (CVectorElement* off = desc.xc_OFF.get()) {
off->GetValue(x58_frameIdx, offset); off->GetValue(x58_frameIdx, offset);
offset.y() = 0.f; offset.y() = 0.f;
@ -96,71 +98,69 @@ void CDecal::RenderQuad(CQuadDecal& decal, const SQuadDescr& desc) const {
CGraphics::SetModelMatrix(modXf); CGraphics::SetModelMatrix(modXf);
SParticleUniforms uniformData = { SParticleUniforms uniformData = {
CGraphics::GetPerspectiveProjectionMatrix(true) * CGraphics::g_GXModelView.toMatrix4f(), {1.f, 1.f, 1.f, 1.f}}; CGraphics::GetPerspectiveProjectionMatrix(true) * CGraphics::g_GXModelView.toMatrix4f(),
decal.m_uniformBuf->load(&uniformData, sizeof(SParticleUniforms)); {1.f, 1.f, 1.f, 1.f},
};
bool redToAlpha = sMoveRedToAlphaBuffer && desc.x18_ADD && desc.x14_TEX; decal.m_uniformBuf.load(uniformData);
SUVElementSet uvSet = {0.f, 1.f, 0.f, 1.f}; SUVElementSet uvSet = {0.f, 1.f, 0.f, 1.f};
if (CUVElement* tex = desc.x14_TEX.get()) { if (CUVElement* tex = desc.x14_TEX.get()) {
TLockedToken<CTexture> texObj = tex->GetValueTexture(x58_frameIdx); TLockedToken<CTexture> texObj = tex->GetValueTexture(x58_frameIdx);
if (!texObj.IsLoaded()) if (!texObj.IsLoaded()) {
return; return;
}
tex->GetValueUV(x58_frameIdx, uvSet); tex->GetValueUV(x58_frameIdx, uvSet);
if (redToAlpha)
CGraphics::SetShaderDataBinding(decal.m_redToAlphaDataBind);
else
CGraphics::SetShaderDataBinding(decal.m_normalDataBind);
g_instTexData.clear(); g_instTexData.clear();
g_instTexData.reserve(1); g_instTexData.reserve(1);
SParticleInstanceTex& inst = g_instTexData.emplace_back(); SParticleInstanceTex& inst = g_instTexData.emplace_back();
if (decal.x8_rotation == 0.f) { if (decal.x8_rotation == 0.f) {
inst.pos[0] = zeus::CVector3f(-size, 0.001f, size); inst.pos[0] = hsh::float4(-size, 0.001f, size, 1.f);
inst.pos[1] = zeus::CVector3f(size, 0.001f, size); inst.pos[1] = hsh::float4(size, 0.001f, size, 1.f);
inst.pos[2] = zeus::CVector3f(-size, 0.001f, -size); inst.pos[2] = hsh::float4(-size, 0.001f, -size, 1.f);
inst.pos[3] = zeus::CVector3f(size, 0.001f, -size); inst.pos[3] = hsh::float4(size, 0.001f, -size, 1.f);
} else { } else {
float ang = zeus::degToRad(decal.x8_rotation); float ang = zeus::degToRad(decal.x8_rotation);
float sinSize = std::sin(ang) * size; float sinSize = std::sin(ang) * size;
float cosSize = std::cos(ang) * size; float cosSize = std::cos(ang) * size;
inst.pos[0] = zeus::CVector3f(sinSize - cosSize, 0.001f, cosSize + sinSize); inst.pos[0] = hsh::float4(sinSize - cosSize, 0.001f, cosSize + sinSize, 1.f);
inst.pos[1] = zeus::CVector3f(cosSize + sinSize, 0.001f, cosSize - sinSize); inst.pos[1] = hsh::float4(cosSize + sinSize, 0.001f, cosSize - sinSize, 1.f);
inst.pos[2] = zeus::CVector3f(-(cosSize + sinSize), 0.001f, -(cosSize - sinSize)); inst.pos[2] = hsh::float4(-(cosSize + sinSize), 0.001f, -(cosSize - sinSize), 1.f);
inst.pos[3] = zeus::CVector3f(-sinSize + cosSize, 0.001f, -cosSize - sinSize); inst.pos[3] = hsh::float4(-sinSize + cosSize, 0.001f, -cosSize - sinSize, 1.f);
} }
inst.color = color; inst.color = color;
inst.uvs[0] = zeus::CVector2f(uvSet.xMin, uvSet.yMin); inst.uvs[0] = hsh::float2(uvSet.xMin, uvSet.yMin);
inst.uvs[1] = zeus::CVector2f(uvSet.xMax, uvSet.yMin); inst.uvs[1] = hsh::float2(uvSet.xMax, uvSet.yMin);
inst.uvs[2] = zeus::CVector2f(uvSet.xMin, uvSet.yMax); inst.uvs[2] = hsh::float2(uvSet.xMin, uvSet.yMax);
inst.uvs[3] = zeus::CVector2f(uvSet.xMax, uvSet.yMax); inst.uvs[3] = hsh::float2(uvSet.xMax, uvSet.yMax);
decal.m_instBuf->load(g_instTexData.data(), g_instTexData.size() * sizeof(SParticleInstanceTex)); decal.m_instBuf.load(hsh::detail::ArrayProxy{g_instTexData.data(), g_instTexData.size()});
CGraphics::DrawInstances(0, 4, g_instTexData.size()); m_shaderBuilder.BuildShaderDataBinding(decal, texObj->GetBooTexture())
.draw_instanced(0, 4, g_instIndTexData.size());
} else { } else {
g_instNoTexData.clear(); g_instNoTexData.clear();
g_instNoTexData.reserve(1); g_instNoTexData.reserve(1);
SParticleInstanceNoTex& inst = g_instNoTexData.emplace_back(); SParticleInstanceNoTex& inst = g_instNoTexData.emplace_back();
if (decal.x8_rotation == 0.f) { if (decal.x8_rotation == 0.f) {
inst.pos[0] = zeus::CVector3f(-size, 0.001f, size); inst.pos[0] = hsh::float4(-size, 0.001f, size, 1.f);
inst.pos[1] = zeus::CVector3f(size, 0.001f, size); inst.pos[1] = hsh::float4(size, 0.001f, size, 1.f);
inst.pos[2] = zeus::CVector3f(-size, 0.001f, -size); inst.pos[2] = hsh::float4(-size, 0.001f, -size, 1.f);
inst.pos[3] = zeus::CVector3f(size, 0.001f, -size); inst.pos[3] = hsh::float4(size, 0.001f, -size, 1.f);
} else { } else {
float ang = zeus::degToRad(decal.x8_rotation); float ang = zeus::degToRad(decal.x8_rotation);
float sinSize = std::sin(ang) * size; float sinSize = std::sin(ang) * size;
float cosSize = std::cos(ang) * size; float cosSize = std::cos(ang) * size;
inst.pos[0] = zeus::CVector3f(sinSize - cosSize, 0.001f, cosSize + sinSize); inst.pos[0] = hsh::float4(sinSize - cosSize, 0.001f, cosSize + sinSize, 1.f);
inst.pos[1] = zeus::CVector3f(cosSize + sinSize, 0.001f, cosSize - sinSize); inst.pos[1] = hsh::float4(cosSize + sinSize, 0.001f, cosSize - sinSize, 1.f);
inst.pos[2] = zeus::CVector3f(-(cosSize + sinSize), 0.001f, -(cosSize - sinSize)); inst.pos[2] = hsh::float4(-(cosSize + sinSize), 0.001f, -(cosSize - sinSize), 1.f);
inst.pos[3] = zeus::CVector3f(-sinSize + cosSize, 0.001f, -cosSize - sinSize); inst.pos[3] = hsh::float4(-sinSize + cosSize, 0.001f, -cosSize - sinSize, 1.f);
} }
inst.color = color; inst.color = color;
decal.m_instBuf->load(g_instNoTexData.data(), g_instNoTexData.size() * sizeof(SParticleInstanceNoTex)); decal.m_instBuf.load(hsh::detail::ArrayProxy{g_instNoTexData.data(), g_instNoTexData.size()});
CGraphics::DrawInstances(0, 4, g_instNoTexData.size()); m_shaderBuilder.BuildShaderDataBinding(decal, hsh::texture2d{}).draw_instanced(0, 4, g_instNoTexData.size());
} }
} }

10
Runtime/Particle/CDecal.hpp
View File

@ -4,9 +4,10 @@
#include "Runtime/CRandom16.hpp" #include "Runtime/CRandom16.hpp"
#include "Runtime/CToken.hpp" #include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp" #include "Runtime/Graphics/Shaders/CDecalShaders.hpp"
#include "Runtime/Particle/CDecalDescription.hpp" #include "Runtime/Particle/CDecalDescription.hpp"
#include "Runtime/Particle/CParticleGlobals.hpp" #include "Runtime/Particle/CParticleGlobals.hpp"
#include "Runtime/RetroTypes.hpp"
#include <zeus/CTransform.hpp> #include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp> #include <zeus/CVector3f.hpp>
@ -23,7 +24,6 @@ struct CQuadDecal {
hsh::dynamic_owner<hsh::vertex_buffer_typeless> m_instBuf; hsh::dynamic_owner<hsh::vertex_buffer_typeless> m_instBuf;
hsh::dynamic_owner<hsh::uniform_buffer<SParticleUniforms>> m_uniformBuf; hsh::dynamic_owner<hsh::uniform_buffer<SParticleUniforms>> m_uniformBuf;
hsh::binding m_dataBind;
}; };
class CDecal { class CDecal {
@ -40,16 +40,20 @@ class CDecal {
bool x5c_30_quad2Invalid : 1 = false; bool x5c_30_quad2Invalid : 1 = false;
bool x5c_29_modelInvalid : 1 = false; bool x5c_29_modelInvalid : 1 = false;
zeus::CVector3f x60_rotation; zeus::CVector3f x60_rotation;
CDecalShaders m_shaderBuilder{};
bool InitQuad(CQuadDecal& quad, const SQuadDescr& desc); bool InitQuad(CQuadDecal& quad, const SQuadDescr& desc);
public: public:
CDecal(const TToken<CDecalDescription>& desc, const zeus::CTransform& xf); CDecal(const TToken<CDecalDescription>& desc, const zeus::CTransform& xf);
void RenderQuad(CQuadDecal& decal, const SQuadDescr& desc) const; void RenderQuad(CQuadDecal& decal, const SQuadDescr& desc);
void RenderMdl(); void RenderMdl();
void Render(); void Render();
void Update(float dt); void Update(float dt);
static void SetGlobalSeed(u16); static void SetGlobalSeed(u16);
static bool GetMoveRedToAlphaBuffer() { return sMoveRedToAlphaBuffer; };
static void SetMoveRedToAlphaBuffer(bool); static void SetMoveRedToAlphaBuffer(bool);
}; };
} // namespace urde } // namespace urde