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

fix typos

Browse Source
This commit is contained in:
Mathias Agopian
2022-04-15 09:17:12 -07:00
committed by Mathias Agopian
parent b2cdf9f2b4
commit 550fcfe2e3
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
filament/src/PostProcessManager.cpp
View File

@@ -1465,7 +1465,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::dof(FrameGraph& fg,
};
/*
* dofResolution is used (at compile time for now) to chose between full- or quarter-resolution
* dofResolution is used to chose between full- or quarter-resolution
* for the DoF calculations. Set to [1] for full resolution or [2] for quarter-resolution.
*/
const uint32_t dofResolution = dofOptions.nativeResolution ? 1u : 2u;
@@ -2119,7 +2119,6 @@ PostProcessManager::BloomPassOutput PostProcessManager::bloomPass(FrameGraph& fg
auto hwIn = resources.getTexture(data.in);
auto hwOut = resources.getTexture(data.out);
auto hwStage = resources.getTexture(data.stage);
auto const& outDesc = resources.getDescriptor(data.out);
mi->use(driver);
mi->setParameter("source", hwIn, {
@@ -2137,9 +2136,6 @@ PostProcessManager::BloomPassOutput PostProcessManager::bloomPass(FrameGraph& fg
auto hwDstRT = resources.getRenderPassInfo(
parity ? data.outRT[i] : data.stageRT[i]);
auto w = FTexture::valueForLevel(i, outDesc.width);
auto h = FTexture::valueForLevel(i, outDesc.height);
mi->setParameter("resolution", float4{ w, h, 1.0f / w, 1.0f / h });
mi->commit(driver);
hwDstRT.params.flags.discardStart = TargetBufferFlags::COLOR;

2
filament/src/materials/dof/dofDownsample.mat
View File

@@ -63,7 +63,7 @@ void dummy(){}
void postProcess(inout PostProcessInputs postProcess) {
highp vec2 uv = variable_vertex.xy;
// the source is guaranteed to be a multiple of two, so we now the bilinear weights are 0.25
// the source is guaranteed to be a multiple of two, so we know the bilinear weights are 0.25
vec4 s01 = textureLodOffset(materialParams_color, uv, 0.0, ivec2(0, 1));
vec4 s11 = textureLodOffset(materialParams_color, uv, 0.0, ivec2(1, 1));

2
filament/src/materials/dof/dofMipmap.mat
View File

@@ -59,7 +59,7 @@ void dummy(){}
void postProcess(inout PostProcessInputs postProcess) {
highp vec2 uv = variable_vertex.xy;
// the source is guaranteed to be a multiple of two, so we now the bilinear weights are 0.25
// the source is guaranteed to be a multiple of two, so we know the bilinear weights are 0.25
// the bilateral weights need to be scaled by to match the lower resolution
float weightScale = materialParams.weightScale;