@bigmistqke/view.gl 0.8.1 → 0.9.0

package/dist/index.mjs

@@ -6,19 +6,21 @@ import {
   uniformView,
   vaoView,
   view
-} from "./chunk-6UTWQ36A.mjs";
+} from "./chunk-NRCBGOZB.mjs";
 import {
   AttributeNotFoundError,
   GLCreateError,
+  InstancingUnavailableError,
   ProgramLinkError,
   ShaderCompileError,
   createFramebuffer,
   createTexture,
   created
-} from "./chunk-BDNRC4WD.mjs";
+} from "./chunk-IAM2SWJK.mjs";
 export {
   AttributeNotFoundError,
   GLCreateError,
+  InstancingUnavailableError,
   ProgramLinkError,
   ShaderCompileError,
   attributeView,

package/dist/tag.d.mts

@@ -1,4 +1,4 @@
-import { a7 as GLSLSlot, a8 as GLSL, aa as UniformTokenFn, ac as AttributeTokenFn, ab as AttributeToken, z as AttributeKind, D as AttributeDefinition, ad as InterleaveToken, a5 as ViewSchemaPartial, aj as CompileResult, ak as Prettify, ae as GLSLToSchema, G as GL } from './types-Cy9u5YKs.mjs';
+import { a9 as GLSLSlot, aa as GLSL, ac as UniformTokenFn, ae as AttributeTokenFn, ad as AttributeToken, D as AttributeKind, H as AttributeDefinition, af as InterleaveToken, a7 as ViewSchemaPartial, G as GL, al as CompileResult, am as Prettify, ag as GLSLToSchema } from './types-Z2s1zsZz.mjs';
 
 declare function glsl<TSlot extends GLSLSlot, const TSlots extends TSlot[]>(template: TemplateStringsArray, ...slots: [...TSlots]): GLSL<TSlots>;
 declare const uniform: {
@@ -81,7 +81,7 @@ interface CompileOptions<TSchema extends ViewSchemaPartial> {
      */
     signal?: AbortSignal;
 }
-declare function compile<TVertex extends GLSL, TFragment extends GLSL, TSchema extends ViewSchemaPartial>(gl: WebGLRenderingContext, vertex: TVertex, fragment: TFragment, options?: CompileOptions<TSchema> | undefined): CompileResult<TVertex, TFragment, TSchema> extends infer T ? { [K in keyof T]: CompileResult<TVertex, TFragment, TSchema>[K]; } : never;
+declare function compile<TVertex extends GLSL, TFragment extends GLSL, TSchema extends ViewSchemaPartial>(gl: GL, vertex: TVertex, fragment: TFragment, options?: CompileOptions<TSchema> | undefined): CompileResult<TVertex, TFragment, TSchema> extends infer T ? { [K in keyof T]: CompileResult<TVertex, TFragment, TSchema>[K]; } : never;
 declare namespace compile {
     var toSchema: <TTag extends GLSL>(tag: TTag) => Prettify<GLSLToSchema<TTag>>;
     var toString: <TTag extends GLSL>({ template: [initial, ...rest], slots }: TTag, config?: {

package/dist/tag.mjs

@@ -1,11 +1,13 @@
+import {
+  createProgram
+} from "./chunk-UVDTF5P3.mjs";
 import {
   toID,
   view
-} from "./chunk-6UTWQ36A.mjs";
+} from "./chunk-NRCBGOZB.mjs";
 import {
-  createProgram,
   once
-} from "./chunk-BDNRC4WD.mjs";
+} from "./chunk-IAM2SWJK.mjs";
 
 // src/tag.ts
 function glsl(template, ...slots) {

package/dist/tag.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/tag.ts"],"sourcesContent":["import { toID, view } from '.'\nimport { createProgram } from './gl'\nimport type { Prettify } from './type-utils'\nimport type {\n  AttributeDefinition,\n  AttributeKind,\n  AttributeTokenFn as AttributeTagMethod,\n  AttributeToken,\n  CompileResult,\n  GL,\n  GLSL,\n  GLSLSlot,\n  GLSLToSchema,\n  InterleaveToken,\n  UniformDefinition,\n  UniformKind,\n  UniformTokenFn as UniformTagMethod,\n  ViewSchema,\n  ViewSchemaPartial,\n} from './types'\nimport { once } from './utils'\n\nexport function glsl<TSlot extends GLSLSlot, const TSlots extends TSlot[]>(\n  template: TemplateStringsArray,\n  ...slots: [...TSlots]\n): GLSL<TSlots> {\n  return { template, slots, type: 'glsl' }\n}\n\nexport const uniform = new Proxy(\n  {} as {\n    [TKey in UniformKind]: UniformTagMethod<TKey>\n  },\n  {\n    get(target, property) {\n      // @ts-expect-error\n      if (typeof property === 'symbol') return target[property]\n      return (key: string, options?: Omit<UniformDefinition, 'kind'>) => ({\n        type: 'uniform',\n        key,\n        kind: property,\n        ...options,\n      })\n    },\n  },\n)\n\nexport const attribute = new Proxy(\n  {} as {\n    [TKey in AttributeKind]: AttributeTagMethod<TKey>\n  },\n  {\n    get(target, property) {\n      // @ts-expect-error\n      if (typeof property === 'symbol') return target[property]\n      return (key: string, options?: Omit<AttributeDefinition, 'kind'>) => ({\n        type: 'attribute',\n        key,\n        kind: property,\n        ...options,\n      })\n    },\n  },\n)\n\nexport function interleave<\n  const TKey extends string | symbol,\n  const TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>>,\n  const TOptions extends Omit<AttributeDefinition, 'kind'>,\n>(key: TKey, layout: TLayout, instanced: TOptions): InterleaveToken<TKey, TLayout, TOptions>\nexport function interleave<\n  const TKey extends string | symbol,\n  const TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>>,\n>(key: TKey, layout: TLayout): InterleaveToken<TKey, TLayout, { instanced: false }>\nexport function interleave<\n  const TKey extends string | symbol,\n  const TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>>,\n  const TOptions extends Omit<AttributeDefinition, 'kind'>,\n>(key: TKey, layout: TLayout, { instanced, buffer }: Partial<TOptions> = {}) {\n  return {\n    type: 'interleavedAttribute',\n    key,\n    // remove instanced- and type-property\n    layout: layout.map(({ key, kind }) => ({\n      key,\n      kind,\n    })),\n    instanced: !!instanced,\n    buffer,\n  } as unknown as InterleaveToken<TKey, TLayout, TOptions>\n}\n\n/**********************************************************************************/\n/*                                                                                */\n/*                                     Compile                                    */\n/*                                                                                */\n/**********************************************************************************/\n\nexport interface CompileOptions<TSchema extends ViewSchemaPartial> {\n  schema?: TSchema\n  webgl2?: boolean\n  /**\n   * Disposes what `compile` made: the program, and the buffers the view created\n   * for itself. Buffers named by the schema belong to whoever made them.\n   */\n  signal?: AbortSignal\n}\n\nexport function compile<\n  TVertex extends GLSL,\n  TFragment extends GLSL,\n  TSchema extends ViewSchemaPartial,\n>(\n  gl: WebGLRenderingContext,\n  vertex: TVertex,\n  fragment: TFragment,\n  options?: CompileOptions<TSchema> | undefined,\n) {\n  const _vertex = resolveGLSLTag(vertex, options) as { template: string; schema: ViewSchema }\n  const _fragment = resolveGLSLTag(fragment, options) as { template: string; schema: ViewSchema }\n\n  const schema = {\n    uniforms: {\n      ..._vertex.schema.uniforms,\n      ..._fragment.schema.uniforms,\n    },\n    attributes: {\n      ..._vertex.schema.attributes,\n      ..._fragment.schema.attributes,\n    },\n    interleavedAttributes: {\n      ..._vertex.schema.interleavedAttributes,\n      ..._fragment.schema.interleavedAttributes,\n    },\n    // Never produced by a tag — a buffer has no name in the source to be\n    // parsed out of one — but `options.schema` may name buffers for the view to\n    // own, and the deep merge below indexes this object by every key it finds\n    // there. Missing, that threw.\n    buffers: {} as NonNullable<ViewSchema['buffers']>,\n  }\n\n  // Deep merge options.schema with generated schema\n  for (const kind in options?.schema) {\n    const schemaKind = schema[kind as keyof typeof schema]\n    const configSchemaKind = options?.schema[kind]\n\n    for (const key in configSchemaKind) {\n      schemaKind[key] = {\n        ...schemaKind[key],\n        ...configSchemaKind[key],\n      }\n    }\n  }\n\n  try {\n    const program = createProgram(gl, _vertex.template, _fragment.template)\n\n    // The same rule the views follow: `compile` made this program, so `compile`\n    // is what deletes it. A program handed in from outside would not be ours to\n    // delete, and there is no way to hand one in.\n    const resolvedView = view(gl, program, schema)\n    const dispose = once(() => {\n      resolvedView.dispose()\n      gl.deleteProgram(program)\n    })\n    options?.signal?.addEventListener('abort', dispose)\n\n    return {\n      program,\n      schema,\n      view: resolvedView,\n      dispose,\n      vertex: _vertex.template,\n      fragment: _fragment.template,\n    } as unknown as Prettify<CompileResult<TVertex, TFragment, TSchema>>\n  } catch (error) {\n    console.error('Error while creating WebGLProgram - vertex\\n\\n', _vertex.template)\n    console.error('Error while creating WebGLProgram - fragment\\n\\n', _fragment.template)\n\n    throw error\n  }\n}\n\nfunction resolveGLSLTag<TTag extends GLSL>(tag: TTag, options?: { webgl2?: boolean }) {\n  return {\n    template: compile.toString(tag, options),\n    schema: compile.toSchema(tag),\n  }\n}\n\ncompile.toSchema = function <TTag extends GLSL>(tag: TTag) {\n  const result = {\n    uniforms: {},\n    attributes: {},\n    interleavedAttributes: {},\n  }\n\n  tag.slots.forEach(function handleSlot(slot: GLSLSlot) {\n    if (typeof slot !== 'object') {\n      return\n    }\n\n    if (Array.isArray(slot)) {\n      slot.forEach(handleSlot)\n      return\n    }\n\n    if (slot.type === 'glsl') {\n      const { uniforms, attributes, interleavedAttributes } = compile.toSchema(slot)\n\n      result.uniforms = {\n        ...result.uniforms,\n        ...uniforms,\n      }\n      result.attributes = {\n        ...result.attributes,\n        ...attributes,\n      }\n      result.interleavedAttributes = {\n        ...result.interleavedAttributes,\n        ...interleavedAttributes,\n      }\n\n      return\n    }\n\n    const { key: name, type, ...rest } = slot\n\n    // @ts-expect-error\n    result[`${type}s`][name] = rest\n  })\n\n  return result as unknown as Prettify<GLSLToSchema<TTag>>\n}\n\ncompile.toString = function <TTag extends GLSL>(\n  { template: [initial, ...rest], slots }: TTag,\n  config?: { webgl2?: boolean },\n) {\n  const v300 = config?.webgl2 ?? !!initial?.startsWith('#version 300 es')\n\n  let template = initial ?? ''\n\n  for (let i = 0; i < rest.length; i++) {\n    template += `${resolveGlslSlotToString(slots[i]!, v300)}${rest[i]}`\n  }\n\n  return template\n}\n\nfunction resolveGlslSlotToString(slot: GLSLSlot, v300: boolean): string {\n  if (typeof slot !== 'object') {\n    return toID(slot)\n  }\n\n  if (Array.isArray(slot)) {\n    return slot.map(slot => resolveGlslSlotToString(slot, v300)).join('')\n  }\n\n  switch (slot.type) {\n    case 'glsl':\n      return compile.toString(slot)\n    case 'interleavedAttribute':\n      return slot.layout.reduce(\n        (a, v) =>\n          v300 ? `${a}in ${v.kind} ${toID(v.key)};\\n` : `${a}attribute ${v.kind} ${toID(v.key)};\\n`,\n        '',\n      )\n    case 'uniform':\n      if ('size' in slot) {\n        return `${slot.type} ${slot.kind} ${toID(slot.key)}[${slot.size}];`\n      }\n      return `${slot.type} ${slot.kind} ${toID(slot.key)};`\n  }\n\n  if (slot.type === 'attribute') {\n    return `${v300 ? 'in' : slot.type} ${slot.kind} ${toID(slot.key)};`\n  }\n\n  throw new Error(`Unexpected slot: ${JSON.stringify(slot)}`)\n}\n\nconst QUAD_FLOAT_ARRAY = new Float32Array([-1, -1, 1, -1, -1, 1, -1, 1, 1, -1, 1, 1])\n\ncompile.toQuad = function <TFragment extends GLSL, TSchema extends ViewSchemaPartial>(\n  gl: GL,\n  fragment: TFragment,\n  options?: CompileOptions<TSchema>,\n) {\n  const webgl2 = options?.webgl2 ?? fragment.template[0]?.startsWith('#version 300 es')\n\n  const vertex = webgl2\n    ? glsl`#version 300 es\nprecision mediump float;\n\n${attribute.vec2('a_quad')}\n\nout vec2 v_uv;\n\nvoid main() {\n  v_uv = a_quad;\n  gl_Position = vec4(v_uv, 0.0, 1.0);\n}`\n    : glsl`precision mediump float;\n\n${attribute.vec2('a_quad')}\n\nvarying vec2 v_uv;\n\nvoid main() {\n  v_uv = a_quad;\n  gl_Position = vec4(v_uv, 0.0, 1.0);\n}`\n\n  const result = compile(gl, vertex, fragment, options)\n\n  // @ts-expect-error\n  result.view.attributes.a_quad.set(QUAD_FLOAT_ARRAY)\n\n  return result\n}\n"],"mappings":"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","names":["key","slot"]}
+{"version":3,"sources":["../src/tag.ts"],"sourcesContent":["import { toID, view } from '.'\nimport { createProgram } from './gl'\nimport type { Prettify } from './type-utils'\nimport type {\n  AttributeDefinition,\n  AttributeKind,\n  AttributeTokenFn as AttributeTagMethod,\n  AttributeToken,\n  CompileResult,\n  GL,\n  GLSL,\n  GLSLSlot,\n  GLSLToSchema,\n  InterleaveToken,\n  UniformDefinition,\n  UniformKind,\n  UniformTokenFn as UniformTagMethod,\n  ViewSchema,\n  ViewSchemaPartial,\n} from './types'\nimport { once } from './utils'\n\nexport function glsl<TSlot extends GLSLSlot, const TSlots extends TSlot[]>(\n  template: TemplateStringsArray,\n  ...slots: [...TSlots]\n): GLSL<TSlots> {\n  return { template, slots, type: 'glsl' }\n}\n\nexport const uniform = new Proxy(\n  {} as {\n    [TKey in UniformKind]: UniformTagMethod<TKey>\n  },\n  {\n    get(target, property) {\n      // @ts-expect-error\n      if (typeof property === 'symbol') return target[property]\n      return (key: string, options?: Omit<UniformDefinition, 'kind'>) => ({\n        type: 'uniform',\n        key,\n        kind: property,\n        ...options,\n      })\n    },\n  },\n)\n\nexport const attribute = new Proxy(\n  {} as {\n    [TKey in AttributeKind]: AttributeTagMethod<TKey>\n  },\n  {\n    get(target, property) {\n      // @ts-expect-error\n      if (typeof property === 'symbol') return target[property]\n      return (key: string, options?: Omit<AttributeDefinition, 'kind'>) => ({\n        type: 'attribute',\n        key,\n        kind: property,\n        ...options,\n      })\n    },\n  },\n)\n\nexport function interleave<\n  const TKey extends string | symbol,\n  const TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>>,\n  const TOptions extends Omit<AttributeDefinition, 'kind'>,\n>(key: TKey, layout: TLayout, instanced: TOptions): InterleaveToken<TKey, TLayout, TOptions>\nexport function interleave<\n  const TKey extends string | symbol,\n  const TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>>,\n>(key: TKey, layout: TLayout): InterleaveToken<TKey, TLayout, { instanced: false }>\nexport function interleave<\n  const TKey extends string | symbol,\n  const TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>>,\n  const TOptions extends Omit<AttributeDefinition, 'kind'>,\n>(key: TKey, layout: TLayout, { instanced, buffer }: Partial<TOptions> = {}) {\n  return {\n    type: 'interleavedAttribute',\n    key,\n    // remove instanced- and type-property\n    layout: layout.map(({ key, kind }) => ({\n      key,\n      kind,\n    })),\n    instanced: !!instanced,\n    buffer,\n  } as unknown as InterleaveToken<TKey, TLayout, TOptions>\n}\n\n/**********************************************************************************/\n/*                                                                                */\n/*                                     Compile                                    */\n/*                                                                                */\n/**********************************************************************************/\n\nexport interface CompileOptions<TSchema extends ViewSchemaPartial> {\n  schema?: TSchema\n  webgl2?: boolean\n  /**\n   * Disposes what `compile` made: the program, and the buffers the view created\n   * for itself. Buffers named by the schema belong to whoever made them.\n   */\n  signal?: AbortSignal\n}\n\nexport function compile<\n  TVertex extends GLSL,\n  TFragment extends GLSL,\n  TSchema extends ViewSchemaPartial,\n>(gl: GL, vertex: TVertex, fragment: TFragment, options?: CompileOptions<TSchema> | undefined) {\n  const _vertex = resolveGLSLTag(vertex, options) as { template: string; schema: ViewSchema }\n  const _fragment = resolveGLSLTag(fragment, options) as { template: string; schema: ViewSchema }\n\n  const schema = {\n    uniforms: {\n      ..._vertex.schema.uniforms,\n      ..._fragment.schema.uniforms,\n    },\n    attributes: {\n      ..._vertex.schema.attributes,\n      ..._fragment.schema.attributes,\n    },\n    interleavedAttributes: {\n      ..._vertex.schema.interleavedAttributes,\n      ..._fragment.schema.interleavedAttributes,\n    },\n    // Never produced by a tag — a buffer has no name in the source to be\n    // parsed out of one — but `options.schema` may name buffers for the view to\n    // own, and the deep merge below indexes this object by every key it finds\n    // there. Missing, that threw.\n    buffers: {} as NonNullable<ViewSchema['buffers']>,\n  }\n\n  // Deep merge options.schema with generated schema\n  for (const kind in options?.schema) {\n    const schemaKind = schema[kind as keyof typeof schema]\n    const configSchemaKind = options?.schema[kind]\n\n    for (const key in configSchemaKind) {\n      schemaKind[key] = {\n        ...schemaKind[key],\n        ...configSchemaKind[key],\n      }\n    }\n  }\n\n  try {\n    const program = createProgram(gl, _vertex.template, _fragment.template)\n\n    // The same rule the views follow: `compile` made this program, so `compile`\n    // is what deletes it. A program handed in from outside would not be ours to\n    // delete, and there is no way to hand one in.\n    const resolvedView = view(gl, program, schema)\n    const dispose = once(() => {\n      resolvedView.dispose()\n      gl.deleteProgram(program)\n    })\n    options?.signal?.addEventListener('abort', dispose)\n\n    return {\n      program,\n      schema,\n      view: resolvedView,\n      dispose,\n      vertex: _vertex.template,\n      fragment: _fragment.template,\n    } as unknown as Prettify<CompileResult<TVertex, TFragment, TSchema>>\n  } catch (error) {\n    console.error('Error while creating WebGLProgram - vertex\\n\\n', _vertex.template)\n    console.error('Error while creating WebGLProgram - fragment\\n\\n', _fragment.template)\n\n    throw error\n  }\n}\n\nfunction resolveGLSLTag<TTag extends GLSL>(tag: TTag, options?: { webgl2?: boolean }) {\n  return {\n    template: compile.toString(tag, options),\n    schema: compile.toSchema(tag),\n  }\n}\n\ncompile.toSchema = function <TTag extends GLSL>(tag: TTag) {\n  const result = {\n    uniforms: {},\n    attributes: {},\n    interleavedAttributes: {},\n  }\n\n  tag.slots.forEach(function handleSlot(slot: GLSLSlot) {\n    if (typeof slot !== 'object') {\n      return\n    }\n\n    if (Array.isArray(slot)) {\n      slot.forEach(handleSlot)\n      return\n    }\n\n    if (slot.type === 'glsl') {\n      const { uniforms, attributes, interleavedAttributes } = compile.toSchema(slot)\n\n      result.uniforms = {\n        ...result.uniforms,\n        ...uniforms,\n      }\n      result.attributes = {\n        ...result.attributes,\n        ...attributes,\n      }\n      result.interleavedAttributes = {\n        ...result.interleavedAttributes,\n        ...interleavedAttributes,\n      }\n\n      return\n    }\n\n    const { key: name, type, ...rest } = slot\n\n    // @ts-expect-error\n    result[`${type}s`][name] = rest\n  })\n\n  return result as unknown as Prettify<GLSLToSchema<TTag>>\n}\n\ncompile.toString = function <TTag extends GLSL>(\n  { template: [initial, ...rest], slots }: TTag,\n  config?: { webgl2?: boolean },\n) {\n  const v300 = config?.webgl2 ?? !!initial?.startsWith('#version 300 es')\n\n  let template = initial ?? ''\n\n  for (let i = 0; i < rest.length; i++) {\n    template += `${resolveGlslSlotToString(slots[i]!, v300)}${rest[i]}`\n  }\n\n  return template\n}\n\nfunction resolveGlslSlotToString(slot: GLSLSlot, v300: boolean): string {\n  if (typeof slot !== 'object') {\n    return toID(slot)\n  }\n\n  if (Array.isArray(slot)) {\n    return slot.map(slot => resolveGlslSlotToString(slot, v300)).join('')\n  }\n\n  switch (slot.type) {\n    case 'glsl':\n      return compile.toString(slot)\n    case 'interleavedAttribute':\n      return slot.layout.reduce(\n        (a, v) =>\n          v300 ? `${a}in ${v.kind} ${toID(v.key)};\\n` : `${a}attribute ${v.kind} ${toID(v.key)};\\n`,\n        '',\n      )\n    case 'uniform':\n      if ('size' in slot) {\n        return `${slot.type} ${slot.kind} ${toID(slot.key)}[${slot.size}];`\n      }\n      return `${slot.type} ${slot.kind} ${toID(slot.key)};`\n  }\n\n  if (slot.type === 'attribute') {\n    return `${v300 ? 'in' : slot.type} ${slot.kind} ${toID(slot.key)};`\n  }\n\n  throw new Error(`Unexpected slot: ${JSON.stringify(slot)}`)\n}\n\nconst QUAD_FLOAT_ARRAY = new Float32Array([-1, -1, 1, -1, -1, 1, -1, 1, 1, -1, 1, 1])\n\ncompile.toQuad = function <TFragment extends GLSL, TSchema extends ViewSchemaPartial>(\n  gl: GL,\n  fragment: TFragment,\n  options?: CompileOptions<TSchema>,\n) {\n  const webgl2 = options?.webgl2 ?? fragment.template[0]?.startsWith('#version 300 es')\n\n  const vertex = webgl2\n    ? glsl`#version 300 es\nprecision mediump float;\n\n${attribute.vec2('a_quad')}\n\nout vec2 v_uv;\n\nvoid main() {\n  v_uv = a_quad;\n  gl_Position = vec4(v_uv, 0.0, 1.0);\n}`\n    : glsl`precision mediump float;\n\n${attribute.vec2('a_quad')}\n\nvarying vec2 v_uv;\n\nvoid main() {\n  v_uv = a_quad;\n  gl_Position = vec4(v_uv, 0.0, 1.0);\n}`\n\n  const result = compile(gl, vertex, fragment, options)\n\n  // @ts-expect-error\n  result.view.attributes.a_quad.set(QUAD_FLOAT_ARRAY)\n\n  return result\n}\n"],"mappings":"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","names":["key","slot"]}

package/dist/{types-Cy9u5YKs.d.mts → types-Z2s1zsZz.d.mts}

@@ -21,7 +21,29 @@ type ShallowMergeTwo<L, R> = Id<Pick<L, Exclude<keyof L, keyof R>> & Pick<R, Exc
 
 /**********************************************************************************/
 /**********************************************************************************/
-type GL = WebGLRenderingContext | WebGL2RenderingContext;
+type NumericKeys<T> = {
+    [K in keyof T]: T[K] extends number ? K : never;
+}[keyof T];
+/** What a WebGL1 context has and view.gl calls. */
+type WebGL1Core = Pick<WebGLRenderingContext, 'activeTexture' | 'attachShader' | 'bindBuffer' | 'bindFramebuffer' | 'bindTexture' | 'bufferData' | 'bufferSubData' | 'checkFramebufferStatus' | 'compileShader' | 'createBuffer' | 'createFramebuffer' | 'createProgram' | 'createShader' | 'createTexture' | 'deleteBuffer' | 'deleteFramebuffer' | 'deleteProgram' | 'deleteShader' | 'deleteTexture' | 'disableVertexAttribArray' | 'enableVertexAttribArray' | 'framebufferTexture2D' | 'getAttribLocation' | 'getError' | 'getParameter' | 'getProgramInfoLog' | 'getProgramParameter' | 'getShaderInfoLog' | 'getShaderParameter' | 'getUniformLocation' | 'getVertexAttrib' | 'linkProgram' | 'shaderSource' | 'texImage2D' | 'texParameteri' | 'uniform1f' | 'uniform1fv' | 'uniform1i' | 'uniform1iv' | 'uniform2f' | 'uniform2fv' | 'uniform2i' | 'uniform2iv' | 'uniform3f' | 'uniform3fv' | 'uniform3i' | 'uniform3iv' | 'uniform4f' | 'uniform4fv' | 'uniform4i' | 'uniform4iv' | 'uniformMatrix2fv' | 'uniformMatrix3fv' | 'uniformMatrix4fv' | 'vertexAttrib1f' | 'vertexAttrib2f' | 'vertexAttrib3f' | 'vertexAttrib4f' | 'vertexAttribPointer'> & Readonly<Record<NumericKeys<WebGLRenderingContext>, number>>;
+/** Instancing: a WebGL2 context's own, or a wrapper's, under the WebGL2 names. */
+type Instancing = Pick<WebGL2RenderingContext, 'vertexAttribDivisor' | 'drawArraysInstanced' | 'drawElementsInstanced'> & {
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR: number;
+};
+/** Vertex arrays: a WebGL2 context's own, or a wrapper's, under the WebGL2 names. */
+type VertexArrays = Pick<WebGL2RenderingContext, 'createVertexArray' | 'bindVertexArray' | 'deleteVertexArray'> & {
+    readonly VERTEX_ARRAY_BINDING: number;
+};
+/** WebGL2-only members view.gl reaches for where a schema asks for them. */
+type WebGL2Only = Pick<WebGL2RenderingContext, 'vertexAttribIPointer' | 'uniform1ui' | 'uniform1uiv' | 'uniform2ui' | 'uniform2uiv' | 'uniform3ui' | 'uniform3uiv' | 'uniform4ui' | 'uniform4uiv' | 'uniformMatrix2x3fv' | 'uniformMatrix2x4fv' | 'uniformMatrix3x2fv' | 'uniformMatrix3x4fv' | 'uniformMatrix4x2fv' | 'uniformMatrix4x3fv' | 'RGBA32F' | 'RGB32F' | 'RGBA16F' | 'RGB16F' | 'HALF_FLOAT'>;
+/**
+ * The context view.gl draws with: what a WebGL1 context has, plus each WebGL2
+ * feature as optional members under its WebGL2 names. A WebGL2 context is one
+ * as it is. A WebGL1 context with the extensions is one once a wrapper puts
+ * the extension's calls on it under the WebGL2 names; view.gl asks the context
+ * nothing and looks no extension up.
+ */
+type GL = WebGL1Core & Partial<Instancing> & Partial<VertexArrays> & Partial<WebGL2Only>;
 type GLTarget = 'ARRAY_BUFFER' | 'ELEMENT_ARRAY_BUFFER';
 type GLUsage = 'STATIC_DRAW' | 'DYNAMIC_DRAW' | 'STREAM_DRAW';
 type GLTextureTarget = 'TEXTURE_2D' | 'TEXTURE_CUBE_MAP';
@@ -592,4 +614,4 @@ type CompileResult<TVertex extends GLSL, TFragment extends GLSL, TOverrideSchema
     dispose(): void;
 } : never;
 
-export type { TextureParameterValue as $, AttributeSchema as A, BufferSchema as B, AttributeFormat as C, AttributeDefinition as D, AttributeMethods as E, FramebufferDefinition as F, GL as G, InterleavedAttributeLayout as H, InterleavedAttributeSchema as I, InterleavedAttributeDefinition as J, KIND_TO_UNIFORM_FN_NAME_MAP as K, BufferSource as L, ConstantAttributeMethods as M, ConstantSource as N, InterleavedAttributeMethods as O, BufferDefinition as P, BufferMethods as Q, Framebuffer as R, Source as S, TextureDefinition as T, UniformSchema as U, ViewOptions as V, TextureTarget as W, TextureSchema as X, TextureMethods as Y, TextureView as Z, TextureParameterName as _, ViewSchema as a, TextureParameters as a0, InternalFormat as a1, Format as a2, PixelType as a3, TexImage2DOptions as a4, ViewSchemaPartial as a5, GLSLResult as a6, GLSLSlot as a7, GLSL as a8, UniformToken as a9, UniformTokenFn as aa, AttributeToken as ab, AttributeTokenFn as ac, InterleaveToken as ad, GLSLToSchema as ae, GLSLToView as af, GLSLSlotsToSchema as ag, FlattenSlots as ah, MergeGLSLSchema as ai, CompileResult as aj, Prettify as ak, View as b, VertexArrayParticipant as c, VertexArrayMethods as d, UniformView as e, AttributeView as f, InterleavedAttributeView as g, BufferView as h, GLTarget as i, GLUsage as j, GLTextureTarget as k, GLTextureFormat as l, GLTextureType as m, GLTextureFilter as n, GLTextureWrap as o, KIND_TO_SIZE_MAP as p, UniformFnName as q, UniformKind as r, UniformKindMap as s, UniformDefinition as t, UniformElementMethods as u, UniformArrayMethods as v, UniformMethods as w, UniformValue as x, AttributeShortHand as y, AttributeKind as z };
+export type { TextureView as $, AttributeSchema as A, BufferSchema as B, AttributeShortHand as C, AttributeKind as D, AttributeFormat as E, FramebufferDefinition as F, GL as G, AttributeDefinition as H, InterleavedAttributeSchema as I, AttributeMethods as J, KIND_TO_UNIFORM_FN_NAME_MAP as K, InterleavedAttributeLayout as L, InterleavedAttributeDefinition as M, BufferSource as N, ConstantAttributeMethods as O, ConstantSource as P, InterleavedAttributeMethods as Q, BufferDefinition as R, Source as S, TextureDefinition as T, UniformSchema as U, ViewOptions as V, BufferMethods as W, Framebuffer as X, TextureTarget as Y, TextureSchema as Z, TextureMethods as _, ViewSchema as a, TextureParameterName as a0, TextureParameterValue as a1, TextureParameters as a2, InternalFormat as a3, Format as a4, PixelType as a5, TexImage2DOptions as a6, ViewSchemaPartial as a7, GLSLResult as a8, GLSLSlot as a9, GLSL as aa, UniformToken as ab, UniformTokenFn as ac, AttributeToken as ad, AttributeTokenFn as ae, InterleaveToken as af, GLSLToSchema as ag, GLSLToView as ah, GLSLSlotsToSchema as ai, FlattenSlots as aj, MergeGLSLSchema as ak, CompileResult as al, Prettify as am, View as b, VertexArrayParticipant as c, VertexArrayMethods as d, UniformView as e, AttributeView as f, InterleavedAttributeView as g, BufferView as h, Instancing as i, VertexArrays as j, GLTarget as k, GLUsage as l, GLTextureTarget as m, GLTextureFormat as n, GLTextureType as o, GLTextureFilter as p, GLTextureWrap as q, KIND_TO_SIZE_MAP as r, UniformFnName as s, UniformKind as t, UniformKindMap as u, UniformDefinition as v, UniformElementMethods as w, UniformArrayMethods as x, UniformMethods as y, UniformValue as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigmistqke/view.gl",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "👀 Utilities for managing WebGL resources.",
   "exports": {
     ".": {

package/src/errors.ts

@@ -49,6 +49,15 @@ export class AttributeNotFoundError extends Error {
   }
 }
 
+/** A divisor of 1 asked of a context without `vertexAttribDivisor`: the draw cannot instance. */
+export class InstancingUnavailableError extends Error {
+  override name = 'InstancingUnavailableError'
+
+  constructor(readonly attribute: string) {
+    super(`Attribute '${attribute}' is instanced, but the context has no instancing`)
+  }
+}
+
 /** Throws a {@link GLCreateError} for a `create*` that answered `null`. */
 export function created<T>(value: T | null, resource: GLResource): T {
   if (value === null) {

package/src/gl.ts

@@ -2,12 +2,6 @@ import type { GL, ViewOptions } from './types'
 import { created, ProgramLinkError, ShaderCompileError } from './errors'
 import { once } from './utils'
 
-function isWebGL2RenderingContext(
-  gl: WebGLRenderingContext | WebGL2RenderingContext,
-): gl is WebGL2RenderingContext {
-  return typeof WebGL2RenderingContext !== 'undefined' && gl instanceof WebGL2RenderingContext
-}
-
 /**********************************************************************************/
 /*                                                                                */
 /*                                 Create Shader                                  */
@@ -73,43 +67,3 @@ export function createProgram(
 
   return program
 }
-
-/**********************************************************************************/
-/*                                                                                */
-/*                              Get Instanced Arrays                              */
-/*                                                                                */
-/**********************************************************************************/
-
-/** Instancing on `gl`: the context on WebGL2, `ANGLE_instanced_arrays` on WebGL1, else `undefined`. */
-export function getInstancedArrays(gl: GL) {
-  if (isWebGL2RenderingContext(gl)) return gl
-
-  const ext = gl.getExtension('ANGLE_instanced_arrays')
-  if (!ext) return undefined
-
-  return {
-    drawArraysInstanced: ext.drawArraysInstancedANGLE.bind(ext),
-    drawElementsInstanced: ext.drawElementsInstancedANGLE.bind(ext),
-    vertexAttribDivisor: ext.vertexAttribDivisorANGLE.bind(ext),
-  }
-}
-
-/**********************************************************************************/
-/*                                                                                */
-/*                             Get Vertex Array Object                            */
-/*                                                                                */
-/**********************************************************************************/
-
-/** Vertex arrays on `gl`: the context on WebGL2, `OES_vertex_array_object` on WebGL1, else `null`. */
-export function getVertexArrayObject(gl: GL) {
-  if (isWebGL2RenderingContext(gl)) return gl
-
-  const ext = gl.getExtension('OES_vertex_array_object')
-  if (!ext) return null
-
-  return {
-    bindVertexArray: ext.bindVertexArrayOES.bind(ext),
-    createVertexArray: ext.createVertexArrayOES.bind(ext),
-    deleteVertexArray: ext.deleteVertexArrayOES.bind(ext),
-  }
-}

package/src/index.ts

@@ -1,5 +1,4 @@
-import { AttributeNotFoundError, created } from './errors'
-import { getInstancedArrays, getVertexArrayObject } from './gl'
+import { AttributeNotFoundError, InstancingUnavailableError, created } from './errors'
 import type {
   AttributeFormat,
   AttributeKind,
@@ -9,6 +8,7 @@ import type {
   BufferSchema,
   BufferView,
   GL,
+  Instancing,
   UniformView as InferUniformView,
   GLUsage,
   InterleavedAttributeLayout,
@@ -18,6 +18,7 @@ import type {
   UniformSchema,
   VertexArrayMethods,
   VertexArrayParticipant,
+  VertexArrays,
   View,
   ViewOptions,
   ViewSchema,
@@ -146,13 +147,32 @@ export function view<TSchema extends ViewSchema>(
  * outlive the call that did it.
  */
 function bindDefaultVertexArray(gl: GL): () => void {
-  const feature = getVertexArrayObject(gl)
-  if (!feature) {
+  if (!hasVertexArrays(gl)) {
     return () => {}
   }
   const previous = readVertexArrayBinding(gl)
-  feature.bindVertexArray(null)
-  return () => feature.bindVertexArray(previous)
+  gl.bindVertexArray(null)
+  return () => gl.bindVertexArray(previous)
+}
+
+/** Whether `gl` carries the vertex-array feature, every member of it. */
+function hasVertexArrays(gl: GL): gl is GL & VertexArrays {
+  return (
+    typeof gl.createVertexArray === 'function' &&
+    typeof gl.bindVertexArray === 'function' &&
+    typeof gl.deleteVertexArray === 'function' &&
+    typeof gl.VERTEX_ARRAY_BINDING === 'number'
+  )
+}
+
+/** Whether `gl` carries the instancing feature, every member of it. */
+function hasInstancing(gl: GL): gl is GL & Instancing {
+  return (
+    typeof gl.vertexAttribDivisor === 'function' &&
+    typeof gl.drawArraysInstanced === 'function' &&
+    typeof gl.drawElementsInstanced === 'function' &&
+    typeof gl.VERTEX_ATTRIB_ARRAY_DIVISOR === 'number'
+  )
 }
 
 /**
@@ -169,7 +189,7 @@ export function vaoView(
   participants: VertexArrayParticipant[],
   { signal }: ViewOptions = {},
 ): VertexArrayMethods {
-  const feature = getVertexArrayObject(gl)
+  const feature = hasVertexArrays(gl) ? gl : null
 
   const methods: VertexArrayMethods = !feature
     ? {
@@ -183,7 +203,7 @@ export function vaoView(
       }
     : (() => {
         const vertexArray = created(feature.createVertexArray(), 'vertexArray')
-        const previous = readVertexArrayBinding(gl)
+        const previous = readVertexArrayBinding(feature)
         feature.bindVertexArray(vertexArray)
         // Discarding the restorers is the point: the state lives in this array
         // now, and the array is thrown away whole.
@@ -194,7 +214,7 @@ export function vaoView(
 
         return {
           bind() {
-            const previousVertexArray = readVertexArrayBinding(gl)
+            const previousVertexArray = readVertexArrayBinding(feature)
             feature.bindVertexArray(vertexArray)
             // Context state the array cannot hold — see applyToContext.
             participants.forEach(participant => participant.applyToContext?.())
@@ -341,11 +361,19 @@ function handleAttribute(
   glType: GLType,
   isIntegerKind: boolean,
   normalized: boolean,
-  instanced?: boolean,
+  instanced: boolean | undefined,
+  name: string,
 ) {
   gl.enableVertexAttribArray(location)
   if (isIntegerKind) {
-    ;(gl as WebGL2RenderingContext).vertexAttribIPointer(location, size, gl[glType], stride, offset)
+    assertedNotNullish(gl.vertexAttribIPointer, 'the context has no vertexAttribIPointer').call(
+      gl,
+      location,
+      size,
+      gl[glType],
+      stride,
+      offset,
+    )
   } else {
     gl.vertexAttribPointer(location, size, gl[glType], normalized, stride, offset)
   }
@@ -353,30 +381,27 @@ function handleAttribute(
   // Always stated, never inherited: the divisor belongs to the location rather
   // than to the program, so a location left at 1 by an earlier instanced
   // attribute would feed one value to every vertex here.
-  // Get instanced-arrays-feature: extension if webgl, gl if webgl2
-  const instancedArrays = getInstancedArrays(gl)
   if (instanced) {
-    assertedNotNullish(instancedArrays).vertexAttribDivisor(location, 1)
-  } else if (instancedArrays) {
-    instancedArrays.vertexAttribDivisor(location, 0)
+    if (!hasInstancing(gl)) {
+      throw new InstancingUnavailableError(name)
+    }
+    gl.vertexAttribDivisor(location, 1)
+  } else if (hasInstancing(gl)) {
+    gl.vertexAttribDivisor(location, 0)
   }
 }
 
-// Same enum in webgl2 and in the webgl1 extensions, which expose no constants
-const VERTEX_ATTRIB_ARRAY_DIVISOR = 0x88fe
-const VERTEX_ARRAY_BINDING = 0x85b5
-
 // Anything but an array or null would make the restore throw a TypeError.
-function readVertexArrayBinding(gl: GL): WebGLVertexArrayObject | null {
-  const bound: unknown = gl.getParameter(VERTEX_ARRAY_BINDING)
+function readVertexArrayBinding(gl: GL & VertexArrays): WebGLVertexArrayObject | null {
+  const bound: unknown = gl.getParameter(gl.VERTEX_ARRAY_BINDING)
   return typeof bound === 'object' ? (bound as WebGLVertexArrayObject | null) : null
 }
 
 // Reads the divisor currently attached to a location, 0 where instancing is
 // unavailable and nothing can have set one
 function readDivisor(gl: GL, location: number): number {
-  return getInstancedArrays(gl)
-    ? (gl.getVertexAttrib(location, VERTEX_ATTRIB_ARRAY_DIVISOR) as number)
+  return hasInstancing(gl)
+    ? (gl.getVertexAttrib(location, gl.VERTEX_ATTRIB_ARRAY_DIVISOR) as number)
     : 0
 }
 
@@ -416,9 +441,11 @@ export function attributeView<T extends AttributeSchema>(
         // it runs, so this binding is the setup for the pointer, not a lasting
         // part of the vertex array's state.
         gl.bindBuffer(gl.ARRAY_BUFFER, buffer)
-        handleAttribute(gl, location, size, 0, 0, glType, isIntKind, normalized, instanced)
+        handleAttribute(gl, location, size, 0, 0, glType, isIntKind, normalized, instanced, name)
         return once(() => {
-          getInstancedArrays(gl)?.vertexAttribDivisor(location, previousDivisor)
+          if (hasInstancing(gl)) {
+            gl.vertexAttribDivisor(location, previousDivisor)
+          }
         })
       }
 
@@ -580,6 +607,7 @@ export function interleavedAttributeView<T extends InterleavedAttributeSchema>(
           isIntKind,
           normalized,
           divisor === 1,
+          name,
         )
     })
 
@@ -602,10 +630,11 @@ export function interleavedAttributeView<T extends InterleavedAttributeSchema>(
         handle(divisor)
       }
       return once(() => {
-        const instancedArrays = getInstancedArrays(gl)
-        previousDivisors.forEach(([location, previous]) => {
-          instancedArrays?.vertexAttribDivisor(location, previous)
-        })
+        if (hasInstancing(gl)) {
+          previousDivisors.forEach(([location, previous]) => {
+            gl.vertexAttribDivisor(location, previous)
+          })
+        }
       })
     }
 

package/src/tag.ts

@@ -110,12 +110,7 @@ export function compile<
   TVertex extends GLSL,
   TFragment extends GLSL,
   TSchema extends ViewSchemaPartial,
->(
-  gl: WebGLRenderingContext,
-  vertex: TVertex,
-  fragment: TFragment,
-  options?: CompileOptions<TSchema> | undefined,
-) {
+>(gl: GL, vertex: TVertex, fragment: TFragment, options?: CompileOptions<TSchema> | undefined) {
   const _vertex = resolveGLSLTag(vertex, options) as { template: string; schema: ViewSchema }
   const _fragment = resolveGLSLTag(fragment, options) as { template: string; schema: ViewSchema }
 

package/src/types.ts

@@ -6,7 +6,120 @@ import { DeepMerge, Prettify, ShallowMerge } from './type-utils'
 /*                                                                                */
 /**********************************************************************************/
 
-export type GL = WebGLRenderingContext | WebGL2RenderingContext
+type NumericKeys<T> = {
+  [K in keyof T]: T[K] extends number ? K : never
+}[keyof T]
+
+/** What a WebGL1 context has and view.gl calls. */
+type WebGL1Core = Pick<
+  WebGLRenderingContext,
+  | 'activeTexture'
+  | 'attachShader'
+  | 'bindBuffer'
+  | 'bindFramebuffer'
+  | 'bindTexture'
+  | 'bufferData'
+  | 'bufferSubData'
+  | 'checkFramebufferStatus'
+  | 'compileShader'
+  | 'createBuffer'
+  | 'createFramebuffer'
+  | 'createProgram'
+  | 'createShader'
+  | 'createTexture'
+  | 'deleteBuffer'
+  | 'deleteFramebuffer'
+  | 'deleteProgram'
+  | 'deleteShader'
+  | 'deleteTexture'
+  | 'disableVertexAttribArray'
+  | 'enableVertexAttribArray'
+  | 'framebufferTexture2D'
+  | 'getAttribLocation'
+  | 'getError'
+  | 'getParameter'
+  | 'getProgramInfoLog'
+  | 'getProgramParameter'
+  | 'getShaderInfoLog'
+  | 'getShaderParameter'
+  | 'getUniformLocation'
+  | 'getVertexAttrib'
+  | 'linkProgram'
+  | 'shaderSource'
+  | 'texImage2D'
+  | 'texParameteri'
+  | 'uniform1f'
+  | 'uniform1fv'
+  | 'uniform1i'
+  | 'uniform1iv'
+  | 'uniform2f'
+  | 'uniform2fv'
+  | 'uniform2i'
+  | 'uniform2iv'
+  | 'uniform3f'
+  | 'uniform3fv'
+  | 'uniform3i'
+  | 'uniform3iv'
+  | 'uniform4f'
+  | 'uniform4fv'
+  | 'uniform4i'
+  | 'uniform4iv'
+  | 'uniformMatrix2fv'
+  | 'uniformMatrix3fv'
+  | 'uniformMatrix4fv'
+  | 'vertexAttrib1f'
+  | 'vertexAttrib2f'
+  | 'vertexAttrib3f'
+  | 'vertexAttrib4f'
+  | 'vertexAttribPointer'
+> &
+  Readonly<Record<NumericKeys<WebGLRenderingContext>, number>>
+
+/** Instancing: a WebGL2 context's own, or a wrapper's, under the WebGL2 names. */
+export type Instancing = Pick<
+  WebGL2RenderingContext,
+  'vertexAttribDivisor' | 'drawArraysInstanced' | 'drawElementsInstanced'
+> & { readonly VERTEX_ATTRIB_ARRAY_DIVISOR: number }
+
+/** Vertex arrays: a WebGL2 context's own, or a wrapper's, under the WebGL2 names. */
+export type VertexArrays = Pick<
+  WebGL2RenderingContext,
+  'createVertexArray' | 'bindVertexArray' | 'deleteVertexArray'
+> & { readonly VERTEX_ARRAY_BINDING: number }
+
+/** WebGL2-only members view.gl reaches for where a schema asks for them. */
+type WebGL2Only = Pick<
+  WebGL2RenderingContext,
+  | 'vertexAttribIPointer'
+  | 'uniform1ui'
+  | 'uniform1uiv'
+  | 'uniform2ui'
+  | 'uniform2uiv'
+  | 'uniform3ui'
+  | 'uniform3uiv'
+  | 'uniform4ui'
+  | 'uniform4uiv'
+  | 'uniformMatrix2x3fv'
+  | 'uniformMatrix2x4fv'
+  | 'uniformMatrix3x2fv'
+  | 'uniformMatrix3x4fv'
+  | 'uniformMatrix4x2fv'
+  | 'uniformMatrix4x3fv'
+  | 'RGBA32F'
+  | 'RGB32F'
+  | 'RGBA16F'
+  | 'RGB16F'
+  | 'HALF_FLOAT'
+>
+
+/**
+ * The context view.gl draws with: what a WebGL1 context has, plus each WebGL2
+ * feature as optional members under its WebGL2 names. A WebGL2 context is one
+ * as it is. A WebGL1 context with the extensions is one once a wrapper puts
+ * the extension's calls on it under the WebGL2 names; view.gl asks the context
+ * nothing and looks no extension up.
+ */
+export type GL = WebGL1Core & Partial<Instancing> & Partial<VertexArrays> & Partial<WebGL2Only>
 
 export type GLTarget = 'ARRAY_BUFFER' | 'ELEMENT_ARRAY_BUFFER'
 export type GLUsage = 'STATIC_DRAW' | 'DYNAMIC_DRAW' | 'STREAM_DRAW'