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

Chore: Use Program.from for Caching, Part 2 #439

Merged
merged 1 commit into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/advanced-bloom/AdvancedBloomFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class AdvancedBloomFilter extends Filter
{
options = { ...AdvancedBloomFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -88,7 +88,7 @@ export class AdvancedBloomFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'advanced-bloom-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/ascii/AsciiFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class AsciiFilter extends Filter

options = { ...AsciiFilter.DEFAULT_OPTIONS, ...options } as AsciiFilterOptions;

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -70,7 +70,7 @@ export class AsciiFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'ascii-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/bulge-pinch/BulgePinchFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class BulgePinchFilter extends Filter
{
options = { ...BulgePinchFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -64,7 +64,7 @@ export class BulgePinchFilter extends Filter
entryPoint: 'mainFragment',
},
});
const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'bulge-pinch-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/color-map/ColorMapFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class ColorMapFilter extends Filter

if (!options.colorMap) throw Error('No color map texture source was provided to ColorMapFilter');

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -71,7 +71,7 @@ export class ColorMapFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'color-map-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/color-overlay/ColorOverlayFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class ColorOverlayFilter extends Filter
{
options = { ...ColorOverlayFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -56,7 +56,7 @@ export class ColorOverlayFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'color-overlay-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/color-replace/ColorReplaceFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class ColorReplaceFilter extends Filter
{
options = { ...ColorReplaceFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -88,7 +88,7 @@ export class ColorReplaceFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'color-replace-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/convolution/ConvolutionFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class ConvolutionFilter extends Filter
const width = options.width ?? 200;
const height = options.height ?? 200;

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -73,7 +73,7 @@ export class ConvolutionFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'convolution-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/dot/DotFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export class DotFilter extends Filter
uGrayScale: { value: options.grayscale ? 1 : 0, type: 'f32' },
};

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -69,7 +69,7 @@ export class DotFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'dot-filter',
Expand Down
8 changes: 4 additions & 4 deletions src/drop-shadow/DropShadowFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class DropShadowFilter extends Filter
{
options = { ...DropShadowFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -112,7 +112,7 @@ export class DropShadowFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'drop-shadow-filter',
Expand Down Expand Up @@ -140,7 +140,7 @@ export class DropShadowFilter extends Filter
});

this._basePass = new Filter({
gpuProgram: new GpuProgram({
gpuProgram: GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -160,7 +160,7 @@ export class DropShadowFilter extends Filter
entryPoint: 'mainFragment',
},
}),
glProgram: new GlProgram({
glProgram: GlProgram.from({
vertex,
fragment: `
in vec2 vTextureCoord;
Expand Down
4 changes: 2 additions & 2 deletions src/emboss/EmbossFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class EmbossFilter extends Filter
{
options = { ...EmbossFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -46,7 +46,7 @@ export class EmbossFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'emboss-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/glitch/GlitchFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export class GlitchFilter extends Filter
{
options = { ...GlitchFilter.defaults, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -132,7 +132,7 @@ export class GlitchFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'glitch-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/godray/GodrayFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export class GodrayFilter extends Filter
{
options = { ...GodrayFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -109,7 +109,7 @@ export class GodrayFilter extends Filter
entryPoint: 'mainFragment',
},
});
const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment: fragment.replace('${PERLIN}', perlin),
name: 'god-ray-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/kawase-blur/KawaseBlurFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class KawaseBlurFilter extends Filter
{
options = { ...KawaseBlurFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -75,7 +75,7 @@ export class KawaseBlurFilter extends Filter
entryPoint: 'mainFragment',
},
});
const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment: options?.clamp ? fragmentClamp : fragment,
name: 'kawase-blur-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/motion-blur/MotionBlurFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export class MotionBlurFilter extends Filter
{
options = { ...MotionBlurFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -66,7 +66,7 @@ export class MotionBlurFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'motion-blur-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/multi-color-replace/MultiColorReplaceFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class MultiColorReplaceFilter extends Filter

const maxColors = options.maxColors ?? options.replacements.length;

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -89,7 +89,7 @@ export class MultiColorReplaceFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment: fragment.replace(/\$\{MAX_COLORS\}/g, (maxColors).toFixed(0)),
name: 'multi-color-replace-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/old-film/OldFilmFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export class OldFilmFilter extends Filter
{
options = { ...OldFilmFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -114,7 +114,7 @@ export class OldFilmFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'old-film-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/outline/OutlineFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export class OutlineFilter extends Filter

const quality = options.quality ?? 0.1;

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -94,7 +94,7 @@ export class OutlineFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment: fragment.replace(/\$\{ANGLE_STEP\}/, OutlineFilter.getAngleStep(quality).toFixed(7)),
name: 'outline-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/pixelate/PixelateFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class PixelateFilter extends Filter
uSize: { value: new Float32Array(2), type: 'vec2<f32>' },
});

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -40,7 +40,7 @@ export class PixelateFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'pixelate-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/radial-blur/RadialBlurFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class RadialBlurFilter extends Filter
{
options = { ...RadialBlurFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -74,7 +74,7 @@ export class RadialBlurFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'radial-blur-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/reflection/ReflectionFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export class ReflectionFilter extends Filter
{
options = { ...ReflectionFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -93,7 +93,7 @@ export class ReflectionFilter extends Filter
entryPoint: 'mainFragment',
},
});
const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'reflection-filter',
Expand Down
4 changes: 2 additions & 2 deletions src/rgb-split/RGBSplitFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class RGBSplitFilter extends Filter
{
options = { ...RGBSplitFilter.DEFAULT_OPTIONS, ...options };

const gpuProgram = new GpuProgram({
const gpuProgram = GpuProgram.from({
vertex: {
source: wgslVertex,
entryPoint: 'mainVertex',
Expand All @@ -60,7 +60,7 @@ export class RGBSplitFilter extends Filter
},
});

const glProgram = new GlProgram({
const glProgram = GlProgram.from({
vertex,
fragment,
name: 'rgb-split-filter',
Expand Down
Loading
Loading