Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More cleanups in PostProcessManager

Browse Source
This commit is contained in:
Mathias Agopian
2022-03-18 22:47:52 -07:00
committed by Mathias Agopian
parent a40ee77326
commit b2ed544ee8
3 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
filament/src/PostProcessManager.cpp
View File

@@ -1136,12 +1136,10 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::gaussianBlurPass(FrameGraph&
return output;
}
FrameGraphId<FrameGraphTexture> PostProcessManager::generateMipmapSSR(FrameGraph& fg,
FrameGraphId<FrameGraphTexture> input,
const float verticalFieldOfView,
filament::Viewport const& svp, float2 scale,
TextureFormat format,
float* pLodOffset) const noexcept {
FrameGraphId <FrameGraphTexture> PostProcessManager::generateMipmapSSR(
PostProcessManager& ppm, FrameGraph& fg, FrameGraphId <FrameGraphTexture> input,
const float verticalFieldOfView, float2 scale, TextureFormat format,
float* pLodOffset) noexcept {
// TODO: add an option to generate a 1/4 res texture (for performance)
@@ -1257,48 +1255,40 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::generateMipmapSSR(FrameGraph
// Then copy the color buffer into a texture, making sure that we keep the original
// buffer aspect-ratio (this is because dynamic-resolution is not necessarily homogenous).
uint32_t w = svp.width;
uint32_t h = svp.height;
uint32_t w = desc.width;
uint32_t h = desc.height;
if (scale.x != scale.y) {
// dynamic resolution wasn't homogenous, which would affect the blur, so make sure to
// keep an intermediary buffer that has the same aspect-ratio as the original.
const float homogenousScale = std::sqrt(scale.x * scale.y);
w = uint32_t((homogenousScale / scale.x) * float(svp.width));
h = uint32_t((homogenousScale / scale.y) * float(svp.height));
w = uint32_t((homogenousScale / scale.x) * float(desc.width));
h = uint32_t((homogenousScale / scale.y) * float(desc.height));
}
PostProcessManager& ppm = mEngine.getPostProcessManager();
/*
* Resolve if needed + copy the image into first LOD
*/
FrameGraphId<FrameGraphTexture> output;
const FrameGraphTexture::Descriptor outDesc{
.width = w, .height = h, .depth = 1,
.levels = roughnessLodCount,
.type = SamplerType::SAMPLER_2D_ARRAY,
.format = format,
};
if (desc.samples > 1 &&
(w == svp.width && h == svp.height) &&
(w == desc.width && h == desc.height) &&
desc.format == format) {
// Here we can resolve directly into a texture with the right dimensions, level count and format
// (resolve CANNOT scale or convert formats)
input = ppm.resolveBaseLevelNoCheck(fg, "Resolved Color Buffer", input, {
.width = w,
.height = h,
.depth = 1,
.levels = roughnessLodCount,
.type = SamplerType::SAMPLER_2D_ARRAY,
.format = format,
});
output = ppm.resolveBaseLevelNoCheck(fg, "Resolved Color Buffer", input, outDesc);
} else {
// first resolve (if needed)
input = ppm.resolveBaseLevel(fg, "Resolved Color Buffer", input);
output = ppm.resolveBaseLevel(fg, "Resolved Color Buffer", input);
// then blit into an appropriate texture
// this handles scaling, format conversion and mipmaping
input = ppm.opaqueBlit(fg, input, {
.width = w,
.height = h,
.depth = 1,
.levels = roughnessLodCount,
.type = SamplerType::SAMPLER_2D_ARRAY,
.format = format,
});
output = ppm.opaqueBlit(fg, output, outDesc);
// Note: it's not possible to use the FrameGraph's forwardResource(), as an optimization
// because the SSR buffer must be distinct from the color buffer (input here), because
// we can't read and write into the same buffer, later in the refraction pass.
@@ -1309,9 +1299,9 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::generateMipmapSSR(FrameGraph
*/
*pLodOffset = refractionLodOffset;
input = ppm.generateGaussianMipmap(fg, input, roughnessLodCount,
output = ppm.generateGaussianMipmap(fg, output, roughnessLodCount,
true, kernelSize, sigma0);
return input;
return output;
}
FrameGraphId<FrameGraphTexture> PostProcessManager::dof(FrameGraph& fg,

14
filament/src/PostProcessManager.h
View File

@@ -96,11 +96,15 @@ public:
FrameGraphId<FrameGraphTexture> input, size_t levels, bool reinhard,
size_t kernelWidth, float sigma) noexcept;
FrameGraphId<FrameGraphTexture> generateMipmapSSR(FrameGraph& fg,
FrameGraphId<FrameGraphTexture> input, float verticalFieldOfView,
filament::Viewport const& svp, math::float2 scale, backend::TextureFormat format,
float* pLodOffset) const noexcept;
// Helper to generate gaussian mipmaps for SSR (refraction and reflections).
// This performs the following tasks:
// - resolves input if needed
// - rescale input so it has a homogenous scale
// - generate a new texture with gaussian mips
static FrameGraphId<FrameGraphTexture> generateMipmapSSR(PostProcessManager& ppm,
FrameGraph& fg,
FrameGraphId<FrameGraphTexture> input, float verticalFieldOfView, math::float2 scale,
backend::TextureFormat format, float* pLodOffset) noexcept;
// Depth-of-field
FrameGraphId<FrameGraphTexture> dof(FrameGraph& fg, FrameGraphId<FrameGraphTexture> input,

10
filament/src/details/Renderer.cpp
View File

@@ -485,9 +485,8 @@ void FRenderer::renderJob(ArenaScope& arena, FView& view) {
{ .width = svp.width, .height = svp.height });
// generate the mipchain
reflections = ppm.generateMipmapSSR(fg, reflections,
view.getCameraUser().getFieldOfView(Camera::Fov::VERTICAL),
config.svp, config.scale,
reflections = PostProcessManager::generateMipmapSSR(ppm, fg, reflections,
view.getCameraUser().getFieldOfView(Camera::Fov::VERTICAL), config.scale,
TextureFormat::RGBA16F,
&config.ssrLodOffset);
@@ -759,9 +758,8 @@ FrameGraphId<FrameGraphTexture> FRenderer::refractionPass(FrameGraph& fg,
view);
// generate the mipmap chain
input = ppm.generateMipmapSSR(fg, input,
view.getCameraUser().getFieldOfView(Camera::Fov::VERTICAL),
config.svp, config.scale,
input = PostProcessManager::generateMipmapSSR(ppm, fg, input,
view.getCameraUser().getFieldOfView(Camera::Fov::VERTICAL), config.scale,
TextureFormat::R11F_G11F_B10F,
&refractionLodOffset);