jsbeeb 1.22.4 → 1.24.0

package/src/url-params.js

@@ -295,17 +295,16 @@ export function guessModelFromHostname(hostname) {
 }
 
 /**
- * Parse disc or tape images from the query parameters
+ * Parse disc images from the query parameters
  * @param {Object} parsedQuery - The query parameters
- * @returns {Object} Object containing disc and tape information
+ * @returns {Object} Object containing disc information
  *   - discImage: disc image URL (?disc= or ?disc1=)
  *   - secondDiscImage: second disc URL (?disc2=)
- *   - tapeImage: tape image URL (?tape=)
  *   - mmcImage: MMC/SD card image URL (?mmc=, Atom only)
  */
 export function parseMediaParams(parsedQuery) {
-    const { disc, disc1, disc2, tape, mmc } = parsedQuery;
+    const { disc, disc1, disc2, mmc } = parsedQuery;
     const discImage = disc || disc1;
 
-    return { discImage, secondDiscImage: disc2, tapeImage: tape, mmcImage: mmc };
+    return { discImage, secondDiscImage: disc2, mmcImage: mmc };
 }

package/src/vdu-capture.js

@@ -0,0 +1,113 @@
+/**
+ * Turns the bytes a program sends to the VDU into text elements,
+ * `{ x, y, text, foreground, background, mode }`, following the cursor and
+ * colour codes and swallowing the parameters of the rest. Text-mode output
+ * only; anything visual wants a screenshot.
+ */
+// How many parameter bytes follow each BBC VDU code that takes any.
+const SequenceParamCounts = {
+    1: 1, // next character to the printer only
+    17: 1, // COLOUR n
+    18: 2, // GCOL
+    19: 5, // define logical colour
+    22: 1, // MODE n
+    25: 5, // PLOT
+    28: 4, // define text window
+    29: 4, // define graphics origin
+    31: 2, // TAB(x,y)
+};
+
+export class VduTextCapture {
+    constructor(onElement, { isAtom = false } = {}) {
+        this.onElement = onElement;
+        this.isAtom = isAtom;
+        this.attributes = { x: 0, y: 0, text: "", foreground: 7, background: 0, mode: 7 };
+        this.currentText = "";
+        this.params = [];
+        this.nextN = 0;
+        this.vduProc = null;
+        this.sequenceHandlers = {
+            17: (p) => {
+                if (p[0] & 0x80) this.attributes.background = p[0] & 0xf;
+                else this.attributes.foreground = p[0] & 0xf;
+            },
+            22: (p) => {
+                Object.assign(this.attributes, { mode: p[0], x: 0, y: 0, foreground: 7, background: 0 });
+            },
+            31: (p) => {
+                this.attributes.x = p[0];
+                this.attributes.y = p[1];
+            },
+        };
+    }
+
+    flush() {
+        if (this.currentText.length) {
+            this.onElement({ ...this.attributes, text: this.currentText });
+            this.attributes.x += this.currentText.length;
+        }
+        this.currentText = "";
+    }
+
+    onChar(c) {
+        const attributes = this.attributes;
+        if (this.nextN) {
+            this.params.push(c);
+            if (--this.nextN === 0) {
+                if (this.vduProc) this.vduProc(this.params);
+                this.params = [];
+                this.vduProc = null;
+            }
+            return;
+        }
+        switch (c) {
+            case 10:
+                this.flush();
+                attributes.y++;
+                return;
+            case 12:
+                this.flush();
+                attributes.x = 0;
+                attributes.y = 0;
+                return;
+            case 13:
+                this.flush();
+                attributes.x = 0;
+                return;
+        }
+        // The Atom has no multi-byte VDU sequences; treating its bytes as
+        // parameters would swallow printable characters.
+        const paramCount = this.isAtom ? undefined : SequenceParamCounts[c];
+        if (paramCount !== undefined) {
+            this.flush();
+            this.nextN = paramCount;
+            this.vduProc = this.sequenceHandlers[c] ?? null;
+            return;
+        }
+        if (c >= 32 && c < 0x7f) this.currentText += String.fromCharCode(c);
+        else this.flush();
+    }
+
+    /** The decoder's position in the byte stream, for a machine snapshot to carry. */
+    snapshot() {
+        return {
+            attributes: { ...this.attributes },
+            currentText: this.currentText,
+            params: [...this.params],
+            nextN: this.nextN,
+        };
+    }
+
+    /**
+     * Puts back a snapshot(). The handler for a half-read sequence is a
+     * closure and does not survive, so such a sequence is dropped rather
+     * than printed as text.
+     */
+    restore(state) {
+        Object.assign(this.attributes, state.attributes);
+        this.currentText = state.currentText;
+        this.params = [...state.params];
+        this.nextN = state.nextN;
+        this.vduProc = null;
+    }
+}

package/src/via.js

@@ -1,5 +1,4 @@
-"use strict";
-import * as utils from "./utils.js";
+import { BBC, getKeyMap } from "./keymap.js";
 
 const ORB = 0x0,
     ORA = 0x1,
@@ -602,7 +601,7 @@ export class SysVia extends Via {
     }
 
     setKeyLayout(map) {
-        this.keycodeToRowCol = utils.getKeyMap(map);
+        this.keycodeToRowCol = getKeyMap(map);
     }
 
     setVBlankInt(level) {
@@ -637,7 +636,7 @@ export class SysVia extends Via {
         if (!mapping) return;
 
         const [col, row, bbcShiftOverride] = mapping;
-        const [shiftCol, shiftRow] = utils.BBC.SHIFT;
+        const [shiftCol, shiftRow] = BBC.SHIFT;
 
         this.keys[col][row] = val;
 

package/src/video-filters/pal-composite.js

@@ -1,5 +1,3 @@
-"use strict";
-
 // PAL Composite Video Filter - Approach D: Baseband Chroma Blending
 //
 // Simulates PAL composite video artifacts by encoding the framebuffer to a

package/src/video-filters/passthrough-filter.js

@@ -1,5 +1,3 @@
-"use strict";
-
 import VERT_SHADER from "./shaders/passthrough.vert.glsl?raw";
 import FRAG_SHADER from "./shaders/passthrough.frag.glsl?raw";
 import { compileProgram } from "./shader-program.js";

package/src/video-filters/pixel-grid.js

@@ -1,5 +1,3 @@
-"use strict";
-
 // Describing the logical pixel grid of jsbeeb's framebuffer, which is a
 // 1024-wide *raster* rather than a grid of BBC pixels: one logical pixel covers
 // up to eight texels across and two down. Filters need to know that, and only

package/src/video-filters/shader-program.js

@@ -1,5 +1,3 @@
-"use strict";
-
 /**
  * Compile and link a shader program, throwing with the driver's own message if
  * either step fails.

package/src/video-filters/xbr-filter.js

@@ -1,5 +1,3 @@
-"use strict";
-
 // The xBR-lv2 display mode. See shaders/xbr.frag.glsl for the algorithm, and
 // tests/shader, which runs it in a browser and asserts on what it draws.
 

package/src/video.js

@@ -1,9 +1,10 @@
-"use strict";
 import { Teletext } from "./teletext.js";
-import * as utils from "./utils.js";
 import { BbcDefaultPalette as NulaDefaultPalette } from "./bbc-palette.js";
 import { Video6847 } from "./6847.js";
 import { encodeLineGrid, texelsPerPixel, LineGridRows } from "./video-filters/pixel-grid.js";
+import { makeFast32 } from "./binary.js";
+
+const noop = () => {};
 
 export const VDISPENABLE = 1 << 0;
 export const HDISPENABLE = 1 << 1;
@@ -338,8 +339,8 @@ function table4bppOffset(ulamode, byte) {
 export class Video {
     constructor(isMaster, fb32_param, paint_ext_param, { isAtom = false } = {}) {
         this.isMaster = isMaster;
-        this.fb32 = utils.makeFast32(fb32_param);
-        this.collook = utils.makeFast32(
+        this.fb32 = makeFast32(fb32_param);
+        this.collook = makeFast32(
             new Uint32Array([
                 0xff000000, 0xff0000ff, 0xff00ff00, 0xff00ffff, 0xffff0000, 0xffff00ff, 0xffffff00, 0xffffffff,
             ]),
@@ -388,7 +389,7 @@ export class Video {
         this.ulaMode = 0;
         this.teletextMode = false;
         this.displayEnableSkew = 0;
-        this.ulaPal = utils.makeFast32(new Uint32Array(16));
+        this.ulaPal = makeFast32(new Uint32Array(16));
         this.actualPal = new Uint8Array(16);
         this.teletext = new Teletext();
         this.cursorOn = false;
@@ -1020,8 +1021,8 @@ export class Video {
             // Without interlace, frames are 312 scanlines. With interlace,
             // both odd and even frames are 312.5 scanlines.
             const isInterlace = !!(this.regs[8] & 1);
-            // TODO: is this off-by-one? b2 uses regs[0]+1.
-            // TODO: does this only hit at the half-scanline or is it a
+            // TODO(#1056) is this off-by-one? b2 uses regs[0]+1.
+            // TODO(#1056) does this only hit at the half-scanline or is it a
             // half-scanline counter that starts when an R7 hit is noticed?
             const halfR0Hit = this.horizCounter === this.regs[0] >>> 1;
             const isVsyncPoint = !isInterlace || !this.doEvenFrameLogic || halfR0Hit;
@@ -1056,7 +1057,7 @@ export class Video {
                 this.teletext.setDEW(this.inVSync);
             }
 
-            // TODO: this will be cleaner if we rework skew to have fetch
+            // TODO(#1056) this will be cleaner if we rework skew to have fetch
             // independent from render.
             const insideBorder = (this.dispEnabled & (HDISPENABLE | VDISPENABLE)) === (HDISPENABLE | VDISPENABLE);
             if ((insideBorder || this.cursorDrawIndex) && this.dispEnabled & FRAMESKIPENABLE) {
@@ -1228,14 +1229,14 @@ export class FakeVideo {
             read: function () {
                 return 0xff;
             },
-            write: utils.noop,
+            write: noop,
         };
         this.ula = {
             read: function () {
                 return 0xff;
             },
-            write: utils.noop,
-            reset: utils.noop,
+            write: noop,
+            reset: noop,
             disabled: false,
         };
         this.regs = new Uint8Array(32);

package/src/wd-fdc.js

@@ -7,7 +7,7 @@ import { BaseDiscDrive, DiscDrive } from "./disc-drive.js";
 import { IbmDiscFormat } from "./disc.js";
 // eslint-disable-next-line no-unused-vars
 import { Scheduler } from "./scheduler.js";
-import * as utils from "./utils.js";
+import { hexbyte } from "./hex.js";
 
 /**
  * Commands.
@@ -147,8 +147,8 @@ export class WdFdc {
         else this._drives = [new DiscDrive(0, scheduler), new DiscDrive(1, scheduler)];
 
         this._isMaster = cpu.model.isMaster;
-        this._is1772 = false; // TODO - if we ever support Master Compact
-        this._isOpus = false; // TODO - if we ever support Opus
+        this._is1772 = false; // TODO(#1059) if we ever support Master Compact
+        this._isOpus = false; // TODO(#1059) if we ever support Opus
 
         this._controlRegister = 0;
         /** @type {Status|Number} */
@@ -219,7 +219,7 @@ export class WdFdc {
 
     _updateNmi() {
         const newLevel = this._isDrq | (this._isOpus ? false : this._isIntRq);
-        // TODO: the cpu handling of NMIs is bad here. Should update to handle multiple
+        // TODO(#1058) the cpu handling of NMIs is bad here. Should update to handle multiple
         // NMI/interrupt sources. And when we do go back and implement the checks in the beebjit
         // source here too.
         this._cpu.NMI(newLevel);
@@ -337,7 +337,7 @@ export class WdFdc {
             case 1:
             case 2:
             case 3:
-                this._logCommand(`control register now ${utils.hexbyte(val)}`);
+                this._logCommand(`control register now ${hexbyte(val)}`);
                 if (this._statusRegister & Status.busy && !this._isReset(val)) {
                     throw new Error(`Control register updated while busy; without reset`);
                 }
@@ -372,8 +372,8 @@ export class WdFdc {
     _doCommand(val) {
         if (!this._currentDrive) throw new Error("Command while no selected drive");
         this._logCommand(
-            `command ${utils.hexbyte(val)} tr ${this._trackRegister} sr ${this._sectorRegister} dr ${this._dataRegister} ` +
-                `cr ${utils.hexbyte(this._controlRegister)} ` +
+            `command ${hexbyte(val)} tr ${this._trackRegister} sr ${this._sectorRegister} dr ${this._dataRegister} ` +
+                `cr ${hexbyte(this._controlRegister)} ` +
                 `ptrk ${this._currentDrive.track} hpos ${this._currentDrive.headPosition}`,
         );
         const command = val & 0xf0;
@@ -387,7 +387,7 @@ export class WdFdc {
             // rule here. Whether a command will do anything when busy seems to depend on
             // the current command, the new command and also the current place in the
             // internal state machine!
-            this._log(`command ${utils.hexbyte(val)} while busy with ${utils.hexbyte(this._command)} - ignoring`);
+            this._log(`command ${hexbyte(val)} while busy with ${hexbyte(this._command)} - ignoring`);
             return;
         }
 
@@ -424,7 +424,7 @@ export class WdFdc {
                 this._commandType = 3;
                 break;
             default:
-                throw new Error(`unimplemented command ${utils.hexbyte(val)}`);
+                throw new Error(`unimplemented command ${hexbyte(val)}`);
         }
         if (this._commandType === 2 || (this._commandType === 3 && val & CommandBits.typeIIorIIISettle))
             this._isCommandSettle = true;
@@ -460,7 +460,7 @@ export class WdFdc {
             // unreliable on a drive that takes a while to come up to speed.
             if (val & CommandBits.disableSpinUp) {
                 this._indexPulseCount = 6;
-                this._log(`command ${utils.hexbyte(val)} spin up wait disabled, motor was off`);
+                this._log(`command ${hexbyte(val)} spin up wait disabled, motor was off`);
                 this._dispatchCommand();
             } else {
                 this._setState(State.spinUpWait);
@@ -476,7 +476,7 @@ export class WdFdc {
             this._log(
                 `State ${this._state} -> ${state} @ tr ${this._trackRegister} ` +
                     `sr ${this._sectorRegister} dr ${this._dataRegister} ` +
-                    `cr ${utils.hexbyte(this._controlRegister)} ` +
+                    `cr ${hexbyte(this._controlRegister)} ` +
                     `ptrk ${this._currentDrive.track} hpos ${this._currentDrive.headPosition}`,
             );
         }
@@ -599,7 +599,7 @@ export class WdFdc {
         if (this._currentDrive && this._currentDrive.spinning) {
             if (!isMotorOn) {
                 throw new Error(
-                    `Unexpected motor control bit off when setting the control register to ${utils.hexbyte(val)}`,
+                    `Unexpected motor control bit off when setting the control register to ${hexbyte(val)}`,
                 );
             }
             this._currentDrive.stopSpinning();
@@ -965,8 +965,8 @@ export class WdFdc {
                 this._deliverData = 0xa1;
                 return true;
             }
-            // TODO: sync to c2 (5224).
-            // Note than an early, naive attempt had it triggered in in the middle of the sector data,
+            // TODO(#1059) sync to c2 (5224).
+            // Note that an early, naive attempt had it triggered in the middle of the sector data,
             // so we'll need to study how it actually works in detail.
             // Tag the byte after 3 sync bytes as a marker.
             if ((this._markDetector & 0xffffffffffff0000n) === 0x4489448944890000n) {
@@ -980,8 +980,8 @@ export class WdFdc {
                     Number(this._markDetector & 0xffffffffn),
                 );
                 if (!iffyPulses && clocks === 0xc7) {
-                    // TODO: see http://info-coach.fr/atari/documents/_mydoc/WD1772-JLG.pdf
-                    // This suggests that a wider ranges of byte values will function as markers. It may also differ FM vs. MFM.
+                    // TODO(#1059) see http://info-coach.fr/atari/documents/_mydoc/WD1772-JLG.pdf
+                    // This suggests that a wider range of byte values will function as markers. It may also differ FM vs. MFM.
                     if (data === 0xf8 || data === 0xfb || data === 0xfe) {
                         // Resync to marker.
                         this._deliverData = data;
@@ -1084,7 +1084,7 @@ export class WdFdc {
             case 0xc2:
                 return IbmDiscFormat.mfmC2Sync;
             default:
-                throw new Error(`Bad marker byte ${utils.hexbyte(byte)}`);
+                throw new Error(`Bad marker byte ${hexbyte(byte)}`);
         }
     }
 
@@ -1119,7 +1119,7 @@ export class WdFdc {
         // EMU NOTE: leave DRQ alone, if it is raised, leave it raised.
         if (this._doRaiseIntRq) this._setIntRq(true);
 
-        this._logCommand(`result status ${utils.hexbyte(this._statusRegister)}`);
+        this._logCommand(`result status ${hexbyte(this._statusRegister)}`);
     }
 
     _checkVerify() {
@@ -1221,7 +1221,7 @@ export class WdFdc {
             if (isCrcError) this._statusRegister |= Status.crcError;
             // Unlike the 8271, read address returns just a single record. It is also not synchronized
             // to the index pulse.
-            // EMU TODO: it's likely that timing is generally off for most states,
+            // EMU TODO(#1059) it's likely that timing is generally off for most states,
             // i.e. the 1770 takes various numbers of internal clock cycles before it
             // delivers the CRC error, before it goes not busy, etc.
             // EMU NOTE: must not clear busy flag right away. The 1770 delivers the
@@ -1435,7 +1435,7 @@ export class WdFdc {
 }
 
 export class NoiseAwareWdFdc extends WdFdc {
-    // TODO: consider deduplicating with the IntelFdc equivalent.
+    // TODO(#1061) consider deduplicating with the IntelFdc equivalent.
     constructor(cpu, ddNoise, scheduler, debugFlags) {
         super(cpu, scheduler, undefined, debugFlags);
         let nextSeekTime = 0;

package/src/web/analogue-inputs.js

@@ -1,5 +1,5 @@
 import { GamepadSource } from "../gamepad-source.js";
-import { MicrophoneInput } from "../microphone-input.js";
+import { MicrophoneInput } from "./microphone-input.js";
 import { MouseJoystickSource } from "../mouse-joystick-source.js";
 import { calculateMouseCoordinates } from "../mouse-coordinates.js";
 import { toast } from "./toast.js";
@@ -12,10 +12,9 @@ const AdcChannelCount = 4;
  * routed to whichever of them wants it.
  */
 export class AnalogueInputs {
-    constructor({ processor, screenCanvas, getGamepads, urlState, config, audioHandler }) {
+    constructor({ processor, screenCanvas, getGamepads, settings, audioHandler }) {
         this.processor = processor;
-        this.urlState = urlState;
-        this.config = config;
+        this.settings = settings;
 
         this.gamepadSource = new GamepadSource(getGamepads);
         // Create MicrophoneInput but don't enable by default
@@ -38,7 +37,7 @@ export class AnalogueInputs {
             if (processor.touchScreen) processor.touchScreen.onMouse(x, y, evt.buttons);
 
             // Handle mouse joystick if enabled
-            if (urlState.params.mouseJoystickEnabled && this.mouseJoystickSource.isEnabled()) {
+            if (settings.mouseJoystickEnabled && this.mouseJoystickSource.isEnabled()) {
                 // Use the API methods instead of direct manipulation
                 this.mouseJoystickSource.onMouseMove(x, y);
 
@@ -89,8 +88,7 @@ export class AnalogueInputs {
     }
 
     clearMicrophoneChannel() {
-        this.config.setMicrophoneChannel(undefined);
-        this.urlState.set({ microphoneChannel: undefined });
+        this.settings.set({ microphoneChannel: undefined });
     }
 
     async ensureMicrophoneRunning() {
@@ -109,7 +107,7 @@ export class AnalogueInputs {
 
     async setupMicrophone() {
         // The channel can have been turned off between the request and now.
-        if (this.urlState.params.microphoneChannel === undefined) return;
+        if (this.settings.microphoneChannel === undefined) return;
         const micPermissionStatus = document.getElementById("micPermissionStatus");
         micPermissionStatus.textContent = "Requesting microphone access...";
 

package/src/web/analytics.js

@@ -0,0 +1,13 @@
+import { runningInNode } from "../loader.js";
+
+export function noteEvent(category, type, label) {
+    if (
+        !runningInNode &&
+        (window.location.host.endsWith(".godbolt.org") || window.location.host.endsWith(".xania.org"))
+    ) {
+        // Only note events on the public site
+        /*global gtag*/
+        gtag("event", category, { type, label });
+    }
+    console.log("event noted:", category, type, label);
+}

package/src/web/audio-handler.js

@@ -2,8 +2,8 @@ import { FakeSoundChip, SoundChip, AtomSoundChip } from "../soundchip.js";
 import { DdNoise, FakeDdNoise } from "../ddnoise.js";
 import { RelayNoise, FakeRelayNoise } from "../relaynoise.js";
 import { Music5000, FakeMusic5000 } from "../music5000.js";
-import { createAudioContext } from "../audio-utils.js";
-import { toggle, fadeIn, fadeOut } from "../dom-utils.js";
+import { createAudioContext } from "./audio-utils.js";
+import { toggle, fadeIn, fadeOut } from "./dom-utils.js";
 import { toast } from "./toast.js";
 
 import rendererUrl from "./audio-renderer.js?worker&url";

package/src/{audio-utils.js → web/audio-utils.js}

@@ -1,5 +1,3 @@
-"use strict";
-
 /**
  * Create an AudioContext with a fallback for older WebKit browsers.
  * @param {AudioContextOptions} [options] - passed to the AudioContext constructor

package/src/web/autoboot.js

@@ -1,7 +1,7 @@
-import * as utils from "../utils.js";
-import * as utils_atom from "../utils_atom.js";
 import * as tokeniser from "../basic-tokenise.js";
-import { basicIdleAddr, installBasic } from "../basic-loader.js";
+import { installBasic } from "../basic-loader.js";
+import { noteEvent } from "./analytics.js";
+import { BBC } from "../keymap.js";
 
 /** Booting and typing for the machine at startup: shift-break, *TAPE incantations and BASIC programs. */
 export class Autoboot {
@@ -12,16 +12,13 @@ export class Autoboot {
         this.sendKeys = sendKeys;
     }
 
-    /** Convert text to machine-appropriate key sequences (BBC or Atom) */
     stringToMachineKeys(text) {
-        return this.model.isAtom ? utils_atom.stringToATOMKeys(text) : utils.stringToBBCKeys(text);
+        return this.model.stringToKeys(text);
     }
 
     boot(image) {
-        const BBC = utils.BBC;
-
         console.log("Autobooting disc");
-        utils.noteEvent("init", "autoboot", image);
+        noteEvent("init", "autoboot", image);
 
         // Shift-break simulation, hold SHIFT for 1000ms.
         this.sendKeys([BBC.SHIFT, 1000], false);
@@ -29,7 +26,7 @@ export class Autoboot {
 
     type(keys) {
         console.log("Auto typing '" + keys + "'");
-        utils.noteEvent("init", "autochain");
+        noteEvent("init", "autochain");
 
         const bbcKeys = this.stringToMachineKeys(keys);
         this.sendKeys([1000].concat(bbcKeys), false);
@@ -37,7 +34,7 @@ export class Autoboot {
 
     chainTape() {
         console.log("Auto Chaining Tape");
-        utils.noteEvent("init", "autochain");
+        noteEvent("init", "autochain");
 
         const bbcKeys = this.stringToMachineKeys('*TAPE\nCH.""\n');
         this.sendKeys([1000].concat(bbcKeys), false);
@@ -45,7 +42,7 @@ export class Autoboot {
 
     runTape() {
         console.log("Auto Running Tape");
-        utils.noteEvent("init", "autorun");
+        noteEvent("init", "autorun");
 
         const bbcKeys = this.stringToMachineKeys("*TAPE\n*/\n");
         this.sendKeys([1000].concat(bbcKeys), false);
@@ -53,7 +50,7 @@ export class Autoboot {
 
     runBasic() {
         console.log("Auto Running basic");
-        utils.noteEvent("init", "autorunbasic");
+        noteEvent("init", "autorunbasic");
 
         const bbcKeys = this.stringToMachineKeys("RUN\n");
         this.sendKeys([1000].concat(bbcKeys), false);
@@ -69,7 +66,7 @@ export class Autoboot {
         const tokenised = await t.tokenise(prog);
 
         const { processor } = this;
-        const idleAddr = basicIdleAddr(processor.model);
+        const idleAddr = this.model.idleAddress;
         const hook = processor.debugInstruction.add((addr) => {
             if (addr !== idleAddr) return;
             installBasic(tokenised, {

package/src/{canvas.js → web/canvas.js}

@@ -1,8 +1,7 @@
-"use strict";
-import webglDebug from "./lib/webgl-debug.js";
-import { PALCompositeFilter } from "./video-filters/pal-composite.js";
-import { PassthroughFilter } from "./video-filters/passthrough-filter.js";
-import { XbrFilter } from "./video-filters/xbr-filter.js";
+import webglDebug from "../lib/webgl-debug.js";
+import { PALCompositeFilter } from "../video-filters/pal-composite.js";
+import { PassthroughFilter } from "../video-filters/passthrough-filter.js";
+import { XbrFilter } from "../video-filters/xbr-filter.js";
 
 const DISPLAY_MODE_FILTERS = {
     pal: PALCompositeFilter,