Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove withParametersWebGL method in Pass classes #8636

Merged
merged 26 commits into from Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
11dcd54
Merge parameters in layers-pass
felixpalmer Mar 15, 2024
83d27df
Bump luma to 9.0.4
felixpalmer Mar 18, 2024
98039b9
Move pick-layers-pass to string constants
felixpalmer Mar 18, 2024
6391a57
Merge branch 'master' into felix/deck-layer-parameters-v9
felixpalmer Mar 18, 2024
4e94f2f
Update modules/core/src/passes/pick-layers-pass.ts
felixpalmer Mar 18, 2024
f987b2c
Merge branch 'master' into felix/deck-layer-parameters-v9
felixpalmer Mar 18, 2024
3bde40d
Remove withParametersWebGL from mask pass
felixpalmer Mar 20, 2024
d45b9eb
Remove from shadow pass
felixpalmer Mar 20, 2024
085cc6a
Migrate collisionFilter pass
felixpalmer Mar 20, 2024
f7e84dc
Tidy
felixpalmer Mar 20, 2024
7ae615f
Migrate TerrainPass
felixpalmer Mar 20, 2024
1bd0b1c
Rename to _BLENDING
felixpalmer Mar 20, 2024
085671a
Merge branch 'felix/deck-layer-parameters-v9' of github.com:visgl/dec…
felixpalmer Mar 20, 2024
aa221e6
TerrainPickingPass
felixpalmer Mar 20, 2024
bf9176b
Allow user to override depth in picking pass
felixpalmer Mar 20, 2024
1e7c43c
Comments
felixpalmer Mar 20, 2024
7abbcbb
Set colorMask on pass
felixpalmer Mar 20, 2024
c1d4179
Merge branch 'master' into felix/deck-layer-parameters-v9
Pessimistress Mar 20, 2024
86e7a64
Fix TerrainPass
Pessimistress Mar 20, 2024
1523318
Merge branch 'master' into felix/deck-layer-parameters-v9
felixpalmer Mar 21, 2024
5b9f382
Attempt to switch to bitmask colorMask
felixpalmer Mar 21, 2024
33266ee
Bump luma 9.0.6
felixpalmer Mar 21, 2024
46d3d66
Off by one error
felixpalmer Mar 21, 2024
49fbdf7
Remove redundant setParametersWebGL call
felixpalmer Mar 21, 2024
90683b0
Set blendConstant on RenderPass
felixpalmer Mar 21, 2024
625d1d3
Revert "Set blendConstant on RenderPass"
felixpalmer Mar 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/core/src/lib/layer.ts
Expand Up @@ -1072,6 +1072,10 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<

context.device.setParametersWebGL({polygonOffset: offsets});

for (const model of this.getModels()) {
model.setParameters(parameters);
}

// Call subclass lifecycle method
context.device.withParametersWebGL(parameters, () => {
felixpalmer marked this conversation as resolved.
Show resolved Hide resolved
const opts = {renderPass, moduleParameters, uniforms, parameters, context};
Expand Down
5 changes: 4 additions & 1 deletion modules/core/src/passes/layers-pass.ts
Expand Up @@ -181,7 +181,10 @@ export default class LayersPass extends Pass {
pass,
moduleParameters
);
layerParam.layerParameters = this.getLayerParameters(layer, layerIndex, viewport);
layerParam.layerParameters = {
...layer.context.deck?.props.parameters,
...this.getLayerParameters(layer, layerIndex, viewport)
};
}
drawLayerParams[layerIndex] = layerParam;
}
Expand Down
75 changes: 38 additions & 37 deletions modules/core/src/passes/pick-layers-pass.ts
@@ -1,14 +1,17 @@
import LayersPass, {LayersPassRenderOptions, RenderStats, Rect} from './layers-pass';
import type {Framebuffer} from '@luma.gl/core';
import {GL, GLParameters} from '@luma.gl/constants';
import type {Framebuffer, RenderPipelineParameters} from '@luma.gl/core';
import log from '../utils/log';

import type Viewport from '../viewports/viewport';
import type Layer from '../lib/layer';

const PICKING_PARAMETERS: GLParameters = {
blendFunc: [GL.ONE, GL.ZERO, GL.CONSTANT_ALPHA, GL.ZERO],
blendEquation: GL.FUNC_ADD
const PICKING_PARAMETERS: RenderPipelineParameters = {
blendColorOperation: 'add',
blendColorSrcFactor: 'one',
blendColorDstFactor: 'zero',
blendAlphaOperation: 'add',
blendAlphaSrcFactor: 'constant-alpha',
blendAlphaDstFactor: 'zero'
};

type PickLayersPassRenderOptions = LayersPassRenderOptions & {
Expand Down Expand Up @@ -75,37 +78,20 @@ export default class PickLayersPass extends LayersPass {
// Note that the callback here is called synchronously.
// Set blend mode for picking
// always overwrite existing pixel with [r,g,b,layerIndex]
const renderStatus = this.device.withParametersWebGL(
{
scissorTest: true,
scissor: [x, y, width, height],
// When used as Mapbox custom layer, the context state may be dirty
// TODO - Remove when mapbox fixes this issue
// https://github.com/mapbox/mapbox-gl-js/issues/7801
depthMask: true,
depthTest: true,
depthRange: [0, 1],
colorMask: [true, true, true, true],
// Blending
...PICKING_PARAMETERS,
blend: !pickZ
},
() =>
super.render({
target: pickingFBO,
layers,
layerFilter,
views,
viewports,
onViewportActive,
cullRect,
effects: effects?.filter(e => e.useInPicking),
pass,
isPicking: true,
moduleParameters,
clearColor: [0, 0, 0, 0]
})
);
const renderStatus = super.render({
target: pickingFBO,
layers,
layerFilter,
views,
viewports,
onViewportActive,
cullRect,
effects: effects?.filter(e => e.useInPicking),
pass,
isPicking: true,
moduleParameters,
clearColor: [0, 0, 0, 0]
});

// Clear the temp field
this._colorEncoderState = null;
Expand Down Expand Up @@ -135,7 +121,22 @@ export default class PickLayersPass extends LayersPass {
}

protected getLayerParameters(layer: Layer, layerIndex: number, viewport: Viewport): any {
const pickParameters = {...layer.props.parameters};
const {x, y, width, height} = viewport;
const pickParameters = {
...layer.props.parameters,
scissorTest: true,
scissor: [x, y, width, height],
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For both perf and WebGPU readiness it's probably appropriate to align LayersPassRenderOptions with luma's RenderPassProps/RenderPassParameters and set scissor/depth parameters per-pass instead of per-layer.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've moved the scissor test to be performed on the pass, but I'm not sure about depth. It is common for layers to override the depth handling via parameters

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The picking pass only resets depth to avoid dirty context state handover (in v8 deck.props.parameters is not set before picking buffer redraw). They can be overwritten by per-layer settings. In this case we should reset the depth parameters in render pass creation. In the other cases depth parameters should override user props.

// When used as Mapbox custom layer, the context state may be dirty
// TODO - Remove when mapbox fixes this issue
// https://github.com/mapbox/mapbox-gl-js/issues/7801
felixpalmer marked this conversation as resolved.
Show resolved Hide resolved
depthMask: true,
depthTest: true,
depthRange: [0, 1],
felixpalmer marked this conversation as resolved.
Show resolved Hide resolved
colorMask: [true, true, true, true],
// Blending
...PICKING_PARAMETERS,
blend: !this.pickZ
};
const {pickable, operation} = layer.props;

if (!this._colorEncoderState) {
Expand Down