fix: use float particle state targets
Some checks failed
validate-scripts / validate-scripts (push) Has been cancelled
Some checks failed
validate-scripts / validate-scripts (push) Has been cancelled
This commit is contained in:
@@ -105,6 +105,18 @@ const char* slotName(const uint8_t slot) {
|
||||
return slot == 0 ? "A" : "B";
|
||||
}
|
||||
|
||||
const char* textureDataTypeName(const gfx::TextureChannelDataType type) {
|
||||
switch (type) {
|
||||
case gfx::TextureChannelDataType::UnsignedByte:
|
||||
return "UnsignedByte";
|
||||
case gfx::TextureChannelDataType::HalfFloat:
|
||||
return "HalfFloat";
|
||||
case gfx::TextureChannelDataType::Float:
|
||||
return "Float";
|
||||
}
|
||||
return "Unknown";
|
||||
}
|
||||
|
||||
Size validViewportSize(const Size size) {
|
||||
return {std::max<uint32_t>(1, size.width), std::max<uint32_t>(1, size.height)};
|
||||
}
|
||||
@@ -601,17 +613,29 @@ private:
|
||||
RenderTargetPtr createValidationTarget(gfx::Context& context,
|
||||
const Size size,
|
||||
const std::string& name,
|
||||
const gfx::TextureFilterType filter) {
|
||||
auto target = context.createRenderTarget(size, gfx::TextureChannelDataType::UnsignedByte);
|
||||
if (!target || !target->getTexture()) {
|
||||
const gfx::TextureFilterType filter,
|
||||
const gfx::TextureChannelDataType type,
|
||||
const char* targetKind) {
|
||||
auto target = context.createRenderTarget(size, type);
|
||||
if (!target || !target->isRenderable() || !target->getTexture()) {
|
||||
Log::Error(Event::Render,
|
||||
"ParticleStateTarget: event=CREATE_FAILED kind=" + std::string(targetKind) +
|
||||
" dataType=" + textureDataTypeName(type) + " name=" + name);
|
||||
return {};
|
||||
}
|
||||
target->getTexture()->setSamplerConfiguration(
|
||||
{.filter = filter, .wrapU = gfx::TextureWrapType::Clamp, .wrapV = gfx::TextureWrapType::Clamp});
|
||||
auto group = context.createLayerGroup(0, 1, name);
|
||||
if (!group || !target->addLayerGroup(std::move(group), true)) {
|
||||
Log::Error(Event::Render,
|
||||
"ParticleStateTarget: event=CREATE_FAILED kind=" + std::string(targetKind) +
|
||||
" dataType=" + textureDataTypeName(type) + " name=" + name + " reason=LAYER_GROUP");
|
||||
return {};
|
||||
}
|
||||
Log::Info(Event::Render,
|
||||
"ParticleStateTarget: event=CREATE_SUCCESS kind=" + std::string(targetKind) +
|
||||
" dataType=" + textureDataTypeName(type) + " name=" + name + " size=" +
|
||||
std::to_string(size.width) + "x" + std::to_string(size.height));
|
||||
return target;
|
||||
}
|
||||
|
||||
@@ -927,10 +951,16 @@ void RenderRasterParticleLayer::update(gfx::ShaderRegistry& shaders,
|
||||
rebuildParticleDrawResources(owned);
|
||||
for (uint8_t i = 0; i < 2; ++i) {
|
||||
owned->stateTargets[i] = createValidationTarget(
|
||||
context, owned->stateSize, getID() + "-state-" + slotName(i), gfx::TextureFilterType::Nearest);
|
||||
context,
|
||||
owned->stateSize,
|
||||
getID() + "-state-" + slotName(i),
|
||||
gfx::TextureFilterType::Nearest,
|
||||
gfx::TextureChannelDataType::Float,
|
||||
"STATE");
|
||||
}
|
||||
if (!owned->shader || !owned->stateTargets[0] || !owned->stateTargets[1]) {
|
||||
Log::Error(Event::Render, "ParticleValidation30_02: State resource creation failed");
|
||||
Log::Error(Event::Render,
|
||||
"ParticleStateTarget: event=CREATE_FAILED kind=STATE dataType=Float reason=FRAMEBUFFER_UNAVAILABLE");
|
||||
return;
|
||||
}
|
||||
owned->maskFixture = makeCoastalMaskFixture();
|
||||
@@ -1059,11 +1089,16 @@ void RenderRasterParticleLayer::update(gfx::ShaderRegistry& shaders,
|
||||
std::array<RenderTargetPtr, 2> replacementTargets;
|
||||
for (uint8_t i = 0; i < 2; ++i) {
|
||||
replacementTargets[i] = createValidationTarget(
|
||||
context, requestedSize, getID() + "-state-" + slotName(i), gfx::TextureFilterType::Nearest);
|
||||
context,
|
||||
requestedSize,
|
||||
getID() + "-state-" + slotName(i),
|
||||
gfx::TextureFilterType::Nearest,
|
||||
gfx::TextureChannelDataType::Float,
|
||||
"STATE");
|
||||
}
|
||||
if (!replacementTargets[0] || !replacementTargets[1]) {
|
||||
Log::Error(Event::Render,
|
||||
"ParticleGPU: event=PARTICLE_COUNT_REJECTED reason=STATE_RESOURCE_CREATE_FAILED "
|
||||
"ParticleGPU: event=PARTICLE_COUNT_REJECTED reason=STATE_RESOURCE_CREATE_FAILED dataType=Float "
|
||||
"requestedParticleCount=" +
|
||||
std::to_string(particleCount) +
|
||||
" effectiveParticleCount=" + std::to_string(resources->particleCount) +
|
||||
@@ -1286,7 +1321,12 @@ void RenderRasterParticleLayer::update(gfx::ShaderRegistry& shaders,
|
||||
resources->trailTargets = {};
|
||||
for (uint8_t i = 0; i < 2; ++i) {
|
||||
resources->trailTargets[i] = createValidationTarget(
|
||||
context, viewport, getID() + "-trail-" + slotName(i), gfx::TextureFilterType::Linear);
|
||||
context,
|
||||
viewport,
|
||||
getID() + "-trail-" + slotName(i),
|
||||
gfx::TextureFilterType::Linear,
|
||||
gfx::TextureChannelDataType::UnsignedByte,
|
||||
"TRAIL");
|
||||
}
|
||||
if (!resources->trailTargets[0] || !resources->trailTargets[1]) {
|
||||
Log::Error(Event::Render, "ParticleGPU: Trail resource creation failed");
|
||||
@@ -1295,6 +1335,12 @@ void RenderRasterParticleLayer::update(gfx::ShaderRegistry& shaders,
|
||||
resources->trailSize = viewport;
|
||||
resources->trailRead = 0;
|
||||
resources->trailSeeded = false;
|
||||
Log::Info(Event::Render,
|
||||
"ParticleStateTarget: stateAType=Float stateBType=Float trailAType=UnsignedByte trailBType=UnsignedByte "
|
||||
"stateGrid=" + std::to_string(resources->stateSize.width) + "x" +
|
||||
std::to_string(resources->stateSize.height) + " trailSize=" +
|
||||
std::to_string(viewport.width) + "x" + std::to_string(viewport.height) +
|
||||
" resourceGeneration=" + std::to_string(resources->generation));
|
||||
Log::Info(Event::Render,
|
||||
"ParticleGPU: Trail A/B " + std::string(previousSize.isEmpty() ? "create" : "resize") +
|
||||
" resourceGeneration=" + std::to_string(resources->generation) +
|
||||
|
||||
Reference in New Issue
Block a user