Examples removed WebGL1 option

examples/iframe/utils.mjs

@@ -81,7 +81,6 @@ function getDeviceType() {
         case 'webgpu':
             console.warn('Picked WebGPU but example is not supported on WebGPU, defaulting to WebGL2');
             return 'webgl2';
-        case 'webgl1':
         case 'webgl2':
             return savedDevice;
         default:

examples/src/app/components/DeviceSelector.mjs

@@ -1,7 +1,6 @@
 // Don't include all of 'playcanvas' for these defines, it just
 // causes bigger bundles and prolongs the build time by ~3s.
 import {
-    DEVICETYPE_WEBGL1,
     DEVICETYPE_WEBGL2,
     DEVICETYPE_WEBGPU,
     DEVICETYPE_NULL
@@ -13,9 +12,8 @@ import { jsx } from '../jsx.mjs';
 import '../events.js';
 
 const deviceTypeNames = {
-    [DEVICETYPE_WEBGL1]: 'WebGL 1',
-    [DEVICETYPE_WEBGL2]: 'WebGL 2',
     [DEVICETYPE_WEBGPU]: 'WebGPU',
+    [DEVICETYPE_WEBGL2]: 'WebGL 2',
     [DEVICETYPE_NULL]: 'Null'
 };
 
@@ -91,28 +89,19 @@ class DeviceSelector extends TypedComponent {
     /**
      * If our preferred device was e.g. WebGPU, but our active device is suddenly e.g. WebGL 2,
      * then we basically infer that WebGPU wasn't supported and mark it like that.
-     * @param {string} preferredDevice - The preferred device.
-     * @param {string} activeDevice - The active device reported from the example iframe.
+     * @param {DEVICETYPE_WEBGPU | DEVICETYPE_WEBGL2} preferredDevice - The preferred device.
+     * @param {DEVICETYPE_WEBGPU | DEVICETYPE_WEBGL2} activeDevice - The active device reported from
+     * the example iframe.
      */
-    setDisabledOptions(preferredDevice = 'webgpu', activeDevice) {
-        if (
-            (preferredDevice === DEVICETYPE_WEBGL2 || preferredDevice === DEVICETYPE_WEBGPU) &&
-            activeDevice === DEVICETYPE_WEBGL1
-        ) {
-            const fallbackOrder = [DEVICETYPE_WEBGPU, DEVICETYPE_WEBGL2, DEVICETYPE_WEBGL1];
+    setDisabledOptions(preferredDevice = DEVICETYPE_WEBGPU, activeDevice) {
+        if (preferredDevice === DEVICETYPE_WEBGL2 && activeDevice !== DEVICETYPE_WEBGL2) {
+            const fallbackOrder = [DEVICETYPE_WEBGL2];
             const disabledOptions = {
-                [DEVICETYPE_WEBGPU]: 'WebGPU (not supported)',
                 [DEVICETYPE_WEBGL2]: 'WebGL 2 (not supported)'
             };
             this.mergeState({ fallbackOrder, disabledOptions, activeDevice });
-        } else if (preferredDevice === DEVICETYPE_WEBGL1 && activeDevice === DEVICETYPE_WEBGL2) {
-            const fallbackOrder = [DEVICETYPE_WEBGL1, DEVICETYPE_WEBGL2, DEVICETYPE_WEBGPU];
-            const disabledOptions = {
-                [DEVICETYPE_WEBGL1]: 'WebGL 1 (not supported)'
-            };
-            this.mergeState({ fallbackOrder, disabledOptions, activeDevice });
         } else if (preferredDevice === DEVICETYPE_WEBGPU && activeDevice !== DEVICETYPE_WEBGPU) {
-            const fallbackOrder = [DEVICETYPE_WEBGPU, DEVICETYPE_WEBGL2, DEVICETYPE_WEBGL1];
+            const fallbackOrder = [DEVICETYPE_WEBGPU, DEVICETYPE_WEBGL2];
             const disabledOptions = {
                 [DEVICETYPE_WEBGPU]: 'WebGPU (not supported)'
             };
@@ -161,9 +150,8 @@ class DeviceSelector extends TypedComponent {
         return jsx(SelectInput, {
             id: 'deviceTypeSelectInput',
             options: [
-                { t: deviceTypeNames[DEVICETYPE_WEBGL1], v: DEVICETYPE_WEBGL1 },
-                { t: deviceTypeNames[DEVICETYPE_WEBGL2], v: DEVICETYPE_WEBGL2 },
                 { t: deviceTypeNames[DEVICETYPE_WEBGPU], v: DEVICETYPE_WEBGPU },
+                { t: deviceTypeNames[DEVICETYPE_WEBGL2], v: DEVICETYPE_WEBGL2 },
                 { t: deviceTypeNames[DEVICETYPE_NULL], v: DEVICETYPE_NULL }
             ],
             value: activeDevice,

examples/src/examples/misc/multi-app/controls.mjs

@@ -39,23 +39,6 @@ export function controls({ observer, ReactPCUI, React, jsx, fragment }) {
                 value: observer.get('webgl2')
             })
         ),
-        jsx(
-            Panel,
-            { headerText: 'WebGL 1' },
-            jsx(Button, {
-                text: 'Add',
-                onClick: () => observer.emit('add:webgl1')
-            }),
-            jsx(Button, {
-                text: 'Remove',
-                onClick: () => observer.emit('remove:webgl1')
-            }),
-            jsx(Label, {
-                binding: new BindingTwoWay(),
-                link: { observer, path: 'webgl1' },
-                value: observer.get('webgl1')
-            })
-        ),
         jsx(
             Panel,
             { headerText: 'Null' },

examples/src/examples/misc/multi-app/example.mjs

@@ -20,7 +20,7 @@ const createApp = async function (deviceType) {
     if (deviceType === 'webgpu') {
         device = new pc.WebgpuGraphicsDevice(canvas, {});
         await device.initWebGpu(rootPath + '/static/lib/glslang/glslang.js', rootPath + '/static/lib/twgsl/twgsl.js');
-    } else if (deviceType === 'webgl1' || deviceType === 'webgl2') {
+    } else if (deviceType === 'webgl2') {
         device = new pc.WebglGraphicsDevice(canvas);
     } else {
         device = new pc.NullGraphicsDevice(canvas, {});
@@ -93,7 +93,7 @@ const createApp = async function (deviceType) {
         app.root.addChild(screen);
 
         // device type as text
-        const text = app.graphicsDevice.isWebGL1 ? 'WebGL 1' : app.graphicsDevice.isWebGL2 ? 'WebGL 2' : 'WebGPU';
+        const text = app.graphicsDevice.isWebGL2 ? 'WebGL 2' : 'WebGPU';
 
         // Text with outline to identify the platform
         const textOutline = new pc.Entity();
@@ -124,7 +124,6 @@ const createApp = async function (deviceType) {
 const apps = {
     webgpu: [],
     webgl2: [],
-    webgl1: [],
     null: []
 };