kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed KRPipeline::setImageBinding, updated all call sites to use image binding reflection system.
Some checks failed
CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Has been cancelled
Details
CMake on multiple platforms / build (Release, clang, clang++, macos-latest) (push) Has been cancelled
Details
CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Has been cancelled
Details
CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Kearwood Gilbert
2026-06-01 00:35:22 -07:00
parent 568a870843
commit 1592087065
9 changed files with 125 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kraken/KRPipeline.cpp
View File

@@ -843,20 +843,3 @@ VkPipeline& KRPipeline::getPipeline()
return m_graphicsPipeline;
}
void KRPipeline::setImageBinding(const std::string& name, KRTexture* texture, KRSampler* sampler)
{
for (int stage = 0; stage < static_cast<size_t>(ShaderStage::ShaderStageCount); stage++) {
StageInfo& stageInfo = m_stages[stage];
for (DescriptorSetInfo& descriptorSetInfo : stageInfo.descriptorSets) {
for (DescriptorBinding& binding : descriptorSetInfo.bindings) {
ImageDescriptorInfo* image = std::get_if<ImageDescriptorInfo>(&binding);
if (image) {
if (image->name == name) {
image->texture = texture;
image->sampler = sampler;
}
}
}
}
}
}

2
kraken/KRPipeline.h
View File

@@ -232,8 +232,6 @@ public:
void setPushConstant(ShaderValue location, const hydra::Matrix4& value);
void setPushConstant(ShaderValue location, const hydra::Matrix4* value, const size_t count);
void setImageBinding(const std::string& name, KRTexture* texture, KRSampler* sampler);
VkPipeline& getPipeline();
void bindDescriptorSets(VkCommandBuffer& commandBuffer);

1
kraken/nodes/KRCamera.cpp
View File

@@ -859,7 +859,6 @@ bool KRCamera::getImageBinding(const std::string& name, const KRTextureBinding**
*binding = &m_skyBox.val;
*sample = getContext().getSamplerManager()->DEFAULT_CLAMPED_SAMPLER;
return true;
} else {
return KRNode::getImageBinding(name, binding, sample);
}

57
kraken/nodes/KRLight.cpp
View File

@@ -174,6 +174,7 @@ void KRLight::getResourceBindings(std::list<KRResourceBinding*>& bindings)
void KRLight::render(RenderInfo& ri)
{
KRNode::render(ri);
ri.reflectedObjects.push_back(this);
if (ri.renderPass->getType() == RenderPassType::RENDER_PASS_SHADOWMAP && (ri.camera->settings.volumetric_environment_enable || ri.camera->settings.dust_particle_enable || (ri.camera->settings.m_cShadowBuffers > 0 && m_casts_shadow))) {
allocateShadowBuffers(configureShadowBufferViewports(*ri.viewport));
@@ -336,6 +337,8 @@ void KRLight::render(RenderInfo& ri)
}
}
ri.reflectedObjects.pop_back();
}
if (ri.renderPass->getType() == RenderPassType::RENDER_PASS_ADDITIVE_PARTICLES) {
@@ -347,35 +350,31 @@ void KRLight::render(RenderInfo& ri)
GLDEBUG(glDeleteQueriesEXT(1, &m_occlusionQuery));
if (params) {
KRMeshManager::KRVBOData& vertices = getContext().getMeshManager()->KRENGINE_VBO_DATA_2D_SQUARE_VERTICES;
KRMeshManager::KRVBOData& vertices = getContext().getMeshManager()->KRENGINE_VBO_DATA_2D_SQUARE_VERTICES;
// Render light flare on transparency pass
PipelineInfo info{};
std::string shader_name("flare");
info.shader_name = &shader_name;
info.pCamera = ri.camera;
info.point_lights = &ri.point_lights;
info.directional_lights = &ri.directional_lights;
info.spot_lights = &ri.spot_lights;
info.renderPass = ri.renderPass;
info.rasterMode = RasterMode::kAdditiveNoTest;
info.cullMode = CullMode::kCullNone;
info.vertexAttributes = vertices.getVertexAttributes();
info.modelFormat = ModelFormat::KRENGINE_MODEL_FORMAT_STRIP;
// Render light flare on transparency pass
PipelineInfo info{};
std::string shader_name("flare");
info.shader_name = &shader_name;
info.pCamera = ri.camera;
info.point_lights = &ri.point_lights;
info.directional_lights = &ri.directional_lights;
info.spot_lights = &ri.spot_lights;
info.renderPass = ri.renderPass;
info.rasterMode = RasterMode::kAdditiveNoTest;
info.cullMode = CullMode::kCullNone;
info.vertexAttributes = vertices.getVertexAttributes();
info.modelFormat = ModelFormat::KRENGINE_MODEL_FORMAT_STRIP;
KRPipeline* pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
if (pShader) {
pShader->setImageBinding("diffuseTexture", m_flareTexture.val.get(), getContext().getSamplerManager()->DEFAULT_CLAMPED_SAMPLER);
if (pShader->bind(ri, getModelMatrix())) {
m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, &vertices, 1.0f);
vkCmdDraw(ri.commandBuffer, 4, 1, 0, 0);
}
}
KRPipeline* pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
if (pShader && pShader->bind(ri, getModelMatrix())) {
m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, &vertices, 1.0f);
vkCmdDraw(ri.commandBuffer, 4, 1, 0, 0);
}
}
}
}
}
}
@@ -552,3 +551,15 @@ bool KRLight::getShaderValue(ShaderValue value, hydra::Vector3* output) const
return KRNode::getShaderValue(value, output);
}
}
bool KRLight::getImageBinding(const std::string& name, const KRTextureBinding** binding, KRSampler** sample) const
{
if (name == "flareTexture") {
*binding = &m_flareTexture.val;
*sample = getContext().getSamplerManager()->DEFAULT_CLAMPED_SAMPLER;
return true;
} else {
return KRNode::getImageBinding(name, binding, sample);
}
}

1
kraken/nodes/KRLight.h
View File

@@ -78,6 +78,7 @@ protected:
bool getShaderValue(ShaderValue value, float* output) const override;
bool getShaderValue(ShaderValue value, hydra::Vector3* output) const override;
bool getImageBinding(const std::string& name, const KRTextureBinding** binding, KRSampler** sample) const final;
// Properties
KRNODE_PROPERTY(float, m_decayStart, 0.f, "decay_start");

56
kraken/nodes/KRSprite.cpp
View File

@@ -113,39 +113,36 @@ void KRSprite::getResourceBindings(std::list<KRResourceBinding*>& bindings)
void KRSprite::render(RenderInfo& ri)
{
KRNode::render(ri);
ri.reflectedObjects.push_back(this);
if (ri.renderPass->getType() == RenderPassType::RENDER_PASS_ADDITIVE_PARTICLES) {
if (m_spriteAlpha > 0.0f) {
if (m_spriteTexture.val.isBound()) {
// TODO - Sprites are currently additive only. Need to expose this and allow for multiple blending modes
// TODO - Sprites are currently additive only. Need to expose this and allow for multiple blending modes
KRMeshManager::KRVBOData& vertices = m_pContext->getMeshManager()->KRENGINE_VBO_DATA_2D_SQUARE_VERTICES;
KRMeshManager::KRVBOData& vertices = m_pContext->getMeshManager()->KRENGINE_VBO_DATA_2D_SQUARE_VERTICES;
// Render light sprite on transparency pass
PipelineInfo info{};
std::string shader_name("sprite");
info.shader_name = &shader_name;
info.pCamera = ri.camera;
info.point_lights = &ri.point_lights;
info.directional_lights = &ri.directional_lights;
info.spot_lights = &ri.spot_lights;
info.renderPass = ri.renderPass;
info.rasterMode = RasterMode::kAdditive;
info.cullMode = CullMode::kCullNone;
info.vertexAttributes = vertices.getVertexAttributes();
info.modelFormat = ModelFormat::KRENGINE_MODEL_FORMAT_STRIP;
// Render light sprite on transparency pass
PipelineInfo info{};
std::string shader_name("sprite");
info.shader_name = &shader_name;
info.pCamera = ri.camera;
info.point_lights = &ri.point_lights;
info.directional_lights = &ri.directional_lights;
info.spot_lights = &ri.spot_lights;
info.renderPass = ri.renderPass;
info.rasterMode = RasterMode::kAdditive;
info.cullMode = CullMode::kCullNone;
info.vertexAttributes = vertices.getVertexAttributes();
info.modelFormat = ModelFormat::KRENGINE_MODEL_FORMAT_STRIP;
KRPipeline* pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
if (pShader) {
pShader->setImageBinding("diffuseTexture", m_spriteTexture.val.get(), m_pContext->getSamplerManager()->DEFAULT_CLAMPED_SAMPLER);
if (pShader->bind(ri, getModelMatrix())) {
m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, &vertices, 1.0f);
vkCmdDraw(ri.commandBuffer, 4, 1, 0, 0);
}
}
KRPipeline* pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
if (pShader && pShader->bind(ri, getModelMatrix())) {
m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, &vertices, 1.0f);
vkCmdDraw(ri.commandBuffer, 4, 1, 0, 0);
}
}
}
ri.reflectedObjects.pop_back();
}
bool KRSprite::getShaderValue(ShaderValue value, float* output) const
@@ -155,3 +152,14 @@ bool KRSprite::getShaderValue(ShaderValue value, float* output) const
return KRNode::getShaderValue(value, output);
}
}
bool KRSprite::getImageBinding(const std::string& name, const KRTextureBinding** binding, KRSampler** sample) const
{
if (name == "spriteTexture") {
*binding = &m_spriteTexture.val;
*sample = getContext().getSamplerManager()->DEFAULT_CLAMPED_SAMPLER;
return true;
} else {
return KRNode::getImageBinding(name, binding, sample);
}
}

1
kraken/nodes/KRSprite.h
View File

@@ -60,6 +60,7 @@ public:
protected:
bool getShaderValue(ShaderValue value, float* output) const override;
bool getImageBinding(const std::string& name, const KRTextureBinding** binding, KRSampler** sample) const final;
KRNODE_PROPERTY(KRTextureBinding, m_spriteTexture, KRTexture::TEXTURE_USAGE_SPRITE, "sprite_texture");
KRNODE_PROPERTY(float, m_spriteAlpha, 1.f, "sprite_alpha");

78
kraken/resources/material/KRMaterial.cpp
View File

@@ -825,28 +825,6 @@ bool KRMaterial::bind(KRNode::RenderInfo& ri, ModelFormat modelFormat, __uint32_
}
}
if (bDiffuseMap) {
pShader->setImageBinding("diffuseTexture", m_baseColorMap.texture.get(), getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER);
}
if (bSpecMap) {
pShader->setImageBinding("specularTexture", m_specularColorMap.texture.get(), getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER);
}
if (bNormalMap) {
pShader->setImageBinding("normalTexture", m_normalMap.texture.get(), getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER);
}
if (bReflectionCubeMap) {
// Deprecated by reflection cubes..
// pShader->setImageBinding("reflectionCubeTexture", m_reflectionCube.get(), getContext().getSamplerManager()->DEFAULT_CLAMPED_SAMPLER);
}
if (bReflectionMap) {
// Deprecated by PBR model..
// pShader->setImageBinding("reflectionTexture", m_reflection.texture.get(), getContext().getSamplerManager()->DEFAULT_CLAMPED_SAMPLER);
}
bool success = true;
ri.reflectedObjects.push_back(this);
if (!pShader->bind(ri, matModel)) {
@@ -1178,3 +1156,59 @@ bool KRMaterial::getShaderValue(ShaderValue value, bool* output) const
return false;
}
}
bool KRMaterial::getImageBinding(const std::string& name, const KRTextureBinding** binding, KRSampler** sample) const
{
// TODO - Need to implement sampler selection / generation system
if (name == "baseColorTexture") {
*binding = &m_baseColorMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "normalTexture") {
*binding = &m_normalMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "emissiveTexture") {
*binding = &m_emissiveMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "occlusionTexture") {
*binding = &m_occlusionMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "metalicRoughnessTexture") {
*binding = &m_metalicRoughnessMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "anisotropyTexture") {
*binding = &m_anisotropyMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "clearcoatTexture") {
*binding = &m_clearcoatMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "clearcoatNormalTexture") {
*binding = &m_clearcoatNormalMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "specularTexture") {
*binding = &m_specularMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "specularColorTexture") {
*binding = &m_specularColorMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "thicknessTexture") {
*binding = &m_thicknessMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else if (name == "transmissionTexture") {
*binding = &m_transmissionMap.texture;
*sample = getContext().getSamplerManager()->DEFAULT_WRAPPING_SAMPLER;
return true;
} else {
return KRReflectedObject::getImageBinding(name, binding, sample);
}
}

1
kraken/resources/material/KRMaterial.h
View File

@@ -190,4 +190,5 @@ private:
bool getShaderValue(ShaderValue value, KRResourceBinding* output) const final;
bool getShaderValue(ShaderValue value, int64_t* output) const final;
bool getShaderValue(ShaderValue value, bool* output) const final;
bool getImageBinding(const std::string& name, const KRTextureBinding** binding, KRSampler** sample) const final;
};