chore(webgl): Start fixing strictNullChecks issues. (#2057)

modules/webgl/src/adapter/converters/texture-formats.ts

@@ -483,7 +483,7 @@ export function isRenderbufferFormatSupported(
   extensions: GLExtensions
 ): boolean {
   // Note: Order is important since the function call initializes extensions.
-  return isTextureFormatSupported(gl, format, extensions) && TEXTURE_FORMATS[format]?.rb;
+  return isTextureFormatSupported(gl, format, extensions) && Boolean(TEXTURE_FORMATS[format]?.rb);
 }
 
 /** Checks if a texture format is supported */
@@ -509,7 +509,7 @@ export function getTextureFormatSupport(
 
   // Support Check that we have a GL constant
   let supported = info.gl === undefined;
-  supported = supported && checkTextureFeature(gl, info.f, extensions);
+  supported = supported && checkTextureFeature(gl, info.f as DeviceFeature, extensions);
 
   // Filtering
   // const filterable = info.filter
@@ -521,8 +521,8 @@ export function getTextureFormatSupport(
 
   return {
     supported,
-    renderable: supported && checkTextureFeature(gl, info.render, extensions),
-    filterable: supported && checkTextureFeature(gl, info.filter, extensions),
+    renderable: supported && checkTextureFeature(gl, info.render as DeviceFeature, extensions),
+    filterable: supported && checkTextureFeature(gl, info.filter as DeviceFeature, extensions),
     blendable: false, // tod,
     storable: false
   };

modules/webgl/src/adapter/device-helpers/webgl-device-features.ts

@@ -71,7 +71,7 @@ export class WebGLDeviceFeatures extends DeviceFeatures {
   }
 
   override has(feature: DeviceFeature): boolean {
-    if (this.disabledFeatures[feature]) {
+    if (this.disabledFeatures?.[feature]) {
       return false;
     }
 

modules/webgl/src/adapter/device-helpers/webgl-device-limits.ts

@@ -48,6 +48,6 @@ export class WebGLDeviceLimits extends DeviceLimits {
     if (this.limits[parameter] === undefined) {
       this.limits[parameter] = this.gl.getParameter(parameter);
     }
-    return this.limits[parameter];
+    return this.limits[parameter] || 0;
   }
 }

modules/webgl/src/adapter/resources/webgl-shader.ts

@@ -44,15 +44,15 @@ export class WEBGLShader extends Shader {
     return this.getCompilationInfoSync();
   }
 
-  override getCompilationInfoSync() {
+  override getCompilationInfoSync(): readonly CompilerMessage[] {
     const log = this.device.gl.getShaderInfoLog(this.handle);
-    return parseShaderCompilerLog(log);
+    return log ? parseShaderCompilerLog(log) : [];
   }
 
   override getTranslatedSource(): string | null {
     const extensions = this.device.getExtension('WEBGL_debug_shaders');
     const ext = extensions.WEBGL_debug_shaders;
-    return ext?.getTranslatedShaderSource(this.handle);
+    return ext?.getTranslatedShaderSource(this.handle) || null;
   }
 
   // PRIVATE METHODS

modules/webgl/src/adapter/resources/webgl-texture-view.ts

@@ -12,8 +12,7 @@ import {WEBGLTexture} from './webgl-texture';
 export class WEBGLTextureView extends TextureView {
   readonly device: WebGLDevice;
   readonly gl: WebGL2RenderingContext;
-  readonly handle: WebGLTexture;
-
+  readonly handle: null; // Does not have a WebGL representation
   readonly texture: WEBGLTexture;
 
   constructor(device: Device, props: TextureViewProps & {texture: WEBGLTexture}) {
@@ -22,7 +21,6 @@ export class WEBGLTextureView extends TextureView {
     this.device = device as WebGLDevice;
     this.gl = this.device.gl;
     this.handle = null;
-
     this.texture = props.texture;
   }
 }

modules/webgl/src/adapter/resources/webgl-texture.ts

@@ -98,10 +98,10 @@ export class WEBGLTexture extends Texture {
   readonly gl: WebGL2RenderingContext;
   handle: WebGLTexture;
 
-  sampler: WEBGLSampler = undefined; // TODO - currently unused in WebGL
-  view: WEBGLTextureView = undefined;
+  sampler: WEBGLSampler = undefined; // TODO - currently unused in WebGL. Create dummy sampler?
+  view: WEBGLTextureView = undefined; // TODO - currently unused in WebGL. Create dummy view?
 
-  mipmaps: boolean = undefined;
+  mipmaps: boolean = false;
 
   /**
    * @note `target` cannot be modified by bind:
@@ -140,11 +140,11 @@ export class WEBGLTexture extends Texture {
     video: HTMLVideoElement;
     parameters: any;
     lastTime: number;
-  };
+  } | null = null;
 
   constructor(device: Device, props: TextureProps) {
     // Note: Clear out `props.data` so that we don't hold a reference to any big memory chunks
-    super(device, {...Texture.defaultProps, ...props, data: undefined});
+    super(device, {...Texture.defaultProps, ...props, data: undefined!});
 
     this.device = device as WebGLDevice;
     this.gl = this.device.gl;
@@ -226,7 +226,7 @@ export class WEBGLTexture extends Texture {
       }
     }
 
-    this.mipmaps = props.mipmaps;
+    this.mipmaps = Boolean(props.mipmaps);
 
     if (this.mipmaps) {
       this.generateMipmap();
@@ -633,7 +633,7 @@ export class WEBGLTexture extends Texture {
     return textureUnit;
   }
 
-  unbind(textureUnit?: number): number {
+  unbind(textureUnit?: number): number | undefined {
     const {gl} = this;
 
     if (textureUnit !== undefined) {

modules/webgl/src/adapter/resources/webgl-vertex-array.ts

@@ -33,10 +33,10 @@ export class WEBGLVertexArray extends VertexArray {
   }
 
   // Create a VertexArray
-  constructor(device: WebGLDevice, props?: VertexArrayProps) {
+  constructor(device: WebGLDevice, props: VertexArrayProps) {
     super(device, props);
     this.device = device;
-    this.handle = this.device.gl.createVertexArray();
+    this.handle = this.device.gl.createVertexArray()!;
   }
 
   override destroy(): void {

modules/webgl/src/adapter/webgl-device.ts

@@ -340,7 +340,7 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
 
   private renderPass: WEBGLRenderPass | null = null;
 
-  override createCommandEncoder(props?: CommandEncoderProps): WEBGLCommandEncoder {
+  override createCommandEncoder(props: CommandEncoderProps = {}): WEBGLCommandEncoder {
     return new WEBGLCommandEncoder(this, props);
   }
 

modules/webgl/src/classic/copy-and-blit.ts

@@ -9,6 +9,7 @@ import {WEBGLFramebuffer} from '../adapter/resources/webgl-framebuffer';
 import {getGLTypeFromTypedArray, getTypedArrayFromGLType} from './typed-array-utils';
 import {glFormatToComponents, glTypeToBytes} from './format-utils';
 import {WEBGLBuffer} from '../adapter/resources/webgl-buffer';
+import {WEBGLTexture} from '../adapter/resources/webgl-texture';
 
 /**
  * Copies data from a type  or a Texture object into ArrayBuffer object.
@@ -204,15 +205,17 @@ export function copyToTexture(
   // TODO - support gl.readBuffer (WebGL2 only)
   // const prevBuffer = gl.readBuffer(attachment);
   // assert(target);
-  let texture = null;
+  let texture: WEBGLTexture | null = null;
   let textureTarget: GL;
-  if (target instanceof Texture) {
+  if (target instanceof WEBGLTexture) {
     texture = target;
     width = Number.isFinite(width) ? width : texture.width;
     height = Number.isFinite(height) ? height : texture.height;
-    texture.bind(0);
+    texture?.bind(0);
+    // @ts-ignore
     textureTarget = texture.target;
   } else {
+    // @ts-ignore
     textureTarget = target;
   }
 

modules/webgl/src/context/debug/webgl-developer-tools.ts

@@ -59,12 +59,7 @@ export async function loadWebGLDeveloperTools(): Promise<void> {
 export function makeDebugContext(
   gl: WebGL2RenderingContext,
   props: DebugContextProps = {}
-): WebGL2RenderingContext | null {
-  // Return null to ensure we don't try to create a context in this case (TODO what case is that?)
-  if (!gl) {
-    return null;
-  }
-
+): WebGL2RenderingContext {
   return props.debug ? getDebugContext(gl, props) : getRealContext(gl);
 }
 

modules/webgl/src/context/parameters/webgl-parameter-tables.ts

@@ -100,7 +100,7 @@ const pixelStorei = (gl: WebGL2RenderingContext, value: number | boolean, key: G
 
 const bindFramebuffer = (gl: WebGL2RenderingContext, value: unknown, key: GL) => {
   const target = key === GL.FRAMEBUFFER_BINDING ? GL.DRAW_FRAMEBUFFER : GL.READ_FRAMEBUFFER;
-  return gl.bindFramebuffer(target, value);
+  return gl.bindFramebuffer(target, value as WebGLFramebuffer);
 };
 
 const bindBuffer = (gl: WebGL2RenderingContext, value: unknown, key: GL) => {
@@ -113,7 +113,7 @@ const bindBuffer = (gl: WebGL2RenderingContext, value: unknown, key: GL) => {
   };
   const glTarget = bindingMap[key];
 
-  gl.bindBuffer(glTarget, value);
+  gl.bindBuffer(glTarget as number, value as WebGLBuffer | null);
 };
 
 // Utility
@@ -304,7 +304,7 @@ export const GL_PARAMETER_SETTERS = {
     gl.polygonOffset(...value),
 
   sampleCoverage: (gl: WebGL2RenderingContext, value: [number, boolean?]) =>
-    gl.sampleCoverage(...value),
+    gl.sampleCoverage(value[0], value[1] || false),
 
   scissorTest: (gl: WebGL2RenderingContext, value) =>
     value ? gl.enable(GL.SCISSOR_TEST) : gl.disable(GL.SCISSOR_TEST),

modules/webgl/src/context/state-tracker/track-context-state.ts

@@ -112,7 +112,7 @@ export function trackContextState(
     log?: any;
   }
 ): WebGL2RenderingContext {
-  const {enable = true, copyState} = options;
+  const {enable = true, copyState} = options || {};
   // assert(copyState !== undefined);
   // @ts-expect-error
   if (!gl.state) {

modules/webgl/test/adapter/resources/webgl-vertex-array.spec.ts

@@ -10,6 +10,7 @@ import {WEBGLBuffer, WEBGLVertexArray} from '@luma.gl/webgl';
 
 // TODO(v9): Fix and re-enable test.
 test.skip('WEBGLVertexArray#divisors', t => {
+  // @ts-ignore
   const vertexArray = new WEBGLVertexArray(device);
 
   const maxVertexAttributes = device.limits.maxVertexAttributes;
@@ -80,6 +81,7 @@ test.skip('WEBGLVertexArray#enable', t => {
 
 // TODO(v9): Fix and re-enable test.
 test.skip('WEBGLVertexArray#getConstantBuffer', t => {
+  // @ts-ignore
   const vertexArray = new WEBGLVertexArray(device);
 
   let buffer = vertexArray.getConstantBuffer(100, new Float32Array([5, 4, 3])) as WEBGLBuffer;

modules/webgl/tsconfig.json

@@ -4,6 +4,7 @@
   "exclude": ["node_modules"],
   "compilerOptions": {
     // "strict": true,
+    // "strictNullChecks": true,
     // "noImplicitAny": true,
     "composite": true,
     "rootDir": "src",