fixes

modules/aggregation-layers/src/contour-layer/contour-layer.ts

@@ -286,8 +286,8 @@ export default class GridLayer<DataT = any, ExtraPropsT extends {} = {}> extends
 
   override draw(opts) {
     // Replaces render time viewport with our own
-    if (opts.moduleParameters.viewport) {
-      opts.moduleParameters.viewport = this.state.aggregatorViewport;
+    if (opts.moduleParameters.project) {
+      opts.moduleParameters.project.viewport = this.state.aggregatorViewport;
     }
     super.draw(opts);
   }

modules/aggregation-layers/src/grid-layer/grid-layer.ts

@@ -489,8 +489,8 @@ export default class GridLayer<DataT = any, ExtraPropsT extends {} = {}> extends
 
   override draw(opts) {
     // Replaces render time viewport with our own
-    if (opts.moduleParameters.viewport) {
-      opts.moduleParameters.viewport = this.state.aggregatorViewport;
+    if (opts.moduleParameters.project) {
+      opts.moduleParameters.project.viewport = this.state.aggregatorViewport;
     }
     super.draw(opts);
   }

modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts

@@ -488,8 +488,8 @@ export default class HexagonLayer<
 
   override draw(opts) {
     // Replaces render time viewport with our own
-    if (opts.moduleParameters.viewport) {
-      opts.moduleParameters.viewport = this.state.aggregatorViewport;
+    if (opts.moduleParameters.project) {
+      opts.moduleParameters.project.viewport = this.state.aggregatorViewport;
     }
     super.draw(opts);
   }

modules/carto/src/layers/post-process-utils.ts

@@ -136,8 +136,9 @@ export function PostProcessModifier<T extends Constructor<DrawableCompositeLayer
       // TODO we could likely render to a smaller buffer for better perf
       const {moduleParameters} = opts;
       const {viewport} = this.context;
-      const width = moduleParameters.devicePixelRatio * viewport.width;
-      const height = moduleParameters.devicePixelRatio * viewport.height;
+      const {devicePixelRatio} = moduleParameters.project;
+      const width = devicePixelRatio * viewport.width;
+      const height = devicePixelRatio * viewport.height;
       this.internalState.renderBuffers.forEach((fbo: Framebuffer) => fbo.resize({width, height}));
     }
 

modules/core/src/lib/layer.ts

@@ -1053,10 +1053,6 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<
     // @ts-ignore (TS2339) internalState is alwasy defined when this method is called
     this.props = this.internalState.propsInTransition || currentProps;
 
-    // apply gamma to opacity to make it visually "linear"
-    const opacity = Math.pow(this.props.opacity, 1 / 2.2);
-    uniforms.opacity = opacity; // TODO remove once layers ported to UBO
-
     try {
       // TODO/ib - hack move to luma Model.draw
       if (moduleParameters) {

modules/core/src/passes/layers-pass.ts

@@ -11,7 +11,6 @@ import type View from '../views/view';
 import type Layer from '../lib/layer';
 import type {Effect} from '../lib/effect';
 import type {ProjectProps} from '../shaderlib/project/viewport-uniforms';
-import type {LayerProps} from '../shaderlib/misc/layer-uniforms';
 import type {PickingProps} from '@luma.gl/shadertools';
 
 export type Rect = {x: number; y: number; width: number; height: number};
@@ -360,9 +359,7 @@ export default class LayersPass extends Pass {
     const layerProps = layer.internalState?.propsInTransition || layer.props;
 
     const moduleParameters = {
-      layer: {
-        opacity: layerProps.opacity
-      } satisfies LayerProps,
+      layer: layerProps,
       picking: {
         isActive: false
       } satisfies PickingProps,

modules/core/src/shaderlib/misc/layer-uniforms.ts

@@ -3,22 +3,30 @@
 // Copyright (c) vis.gl contributors
 
 import type {ShaderModule} from '@luma.gl/shadertools';
+import type {LayerProps} from '../../types/layer-props';
 
 const uniformBlock = `\
 uniform layerUniforms {
   uniform float opacity;
 } layer;
 `;
 
-export type LayerProps = {
+export type LayerUniforms = {
   opacity?: number;
 };
 
 export const layerUniforms = {
   name: 'layer',
   vs: uniformBlock,
   fs: uniformBlock,
+  getUniforms: (props: Partial<LayerProps>) => {
+    return {
+      // apply gamma to opacity to make it visually "linear"
+      // TODO - v10: use raw opacity?
+      opacity: Math.pow(props.opacity!, 1 / 2.2)
+    };
+  },
   uniformTypes: {
     opacity: 'f32'
   }
-} as const satisfies ShaderModule<LayerProps>;
+} as const satisfies ShaderModule<LayerProps, LayerUniforms>;

modules/extensions/src/brushing/brushing-extension.ts

@@ -88,7 +88,7 @@ export default class BrushingExtension extends LayerExtension {
 
   draw(this: Layer<BrushingExtensionProps>, params: any, extension: this) {
     const {viewport, mousePosition} = params.context;
-    const {brushingEnabled, brushingRadius, brushingTarget} = params.moduleParameters;
+    const {brushingEnabled, brushingRadius, brushingTarget} = this.props;
     const brushingProps: BrushingModuleProps = {
       viewport,
       mousePosition,

modules/extensions/src/data-filter/data-filter-extension.ts

@@ -266,21 +266,20 @@ export default class DataFilterExtension extends LayerExtension<
     const filterModel = this.state.filterModel as Model;
     const filterNeedsUpdate = this.state.filterNeedsUpdate as boolean;
 
-    const {onFilteredItemsChange} = this.props;
-
     if (!this.state.categoryBitMask) {
       extension._updateCategoryBitMask.call(this, params, extension);
     }
 
     const {
+      onFilteredItemsChange,
       extensions,
       filterEnabled,
       filterRange,
       filterSoftRange,
       filterTransformSize,
       filterTransformColor,
       filterCategories
-    } = params.moduleParameters;
+    } = this.props;
     const dataFilterProps: DataFilterModuleProps = {
       extensions,
       filterEnabled,

modules/extensions/src/fill-style/fill-style-extension.ts

@@ -159,9 +159,8 @@ export default class FillStyleExtension extends LayerExtension<FillStyleExtensio
       return;
     }
 
-    const {fillPatternAtlas} = this.props;
+    const {fillPatternAtlas, fillPatternEnabled, fillPatternMask} = this.props;
     const {viewport} = params.context;
-    const {fillPatternEnabled, fillPatternMask} = params.moduleParameters;
     const fillProps: FillStyleModuleProps = {
       viewport,
       fillPatternEnabled,

test/modules/core/lib/layer.spec.ts

@@ -449,7 +449,7 @@ test('Layer#uniformTransitions', t => {
       onAfterUpdate: () =>
         t.deepEquals(
           drawCalls.pop(),
-          {opacity: Math.pow(0.5, 1 / 2.2), modelMatrix: scale2Mat4},
+          {opacity: 0.5, modelMatrix: scale2Mat4},
           'layer drawn with opacity in transition'
         )
     },