@luma.gl/webgl 9.0.0-alpha.4 → 9.0.0-alpha.41

package/dist/adapter/converters/texture-formats.js

@@ -1,6 +1,7 @@
-import { decodeTextureFormat } from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-import { isWebGL2 } from '../../context/context/webgl-checks';
+import { decodeTextureFormat } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
+import { isWebGL2 } from "../../context/context/webgl-checks.js";
+import { getGLFromVertexType } from "./vertex-formats.js";
 const texture_compression_bc = 'texture-compression-bc';
 const texture_compression_astc = 'texture-compression-astc';
 const texture_compression_etc2 = 'texture-compression-etc2';
@@ -20,12 +21,8 @@ const EXT_SRGB = 'EXT_sRGB';
 const EXT_TEXTURE_NORM16 = 'EXT_texture_norm16';
 const EXT_FLOAT_WEBGL1 = 'WEBGL_color_buffer_float';
 const EXT_FLOAT_RENDER_WEBGL2 = 'EXT_color_buffer_float';
-const EXT_HALF_FLOAT_WEBGL1 = 'WEBGL_color_buffer_half_float';
-
 const checkExtension = (gl, extension) => gl.getExtension(extension);
-
 const checkExtensions = (gl, extensions) => extensions.every(extension => gl.getExtension(extension));
-
 const TEXTURE_FEATURE_CHECKS = {
   'texture-blend-float-webgl1': gl => isWebGL2(gl) ? true : checkExtension(gl, 'EXT_float_blend'),
   'texture-formats-srgb-webgl1': gl => isWebGL2(gl) ? true : checkExtension(gl, EXT_SRGB),
@@ -48,12 +45,9 @@ const TEXTURE_FEATURE_CHECKS = {
 };
 export function checkTextureFeature(gl, feature) {
   var _TEXTURE_FEATURE_CHEC;
-
-  return (_TEXTURE_FEATURE_CHEC = TEXTURE_FEATURE_CHECKS[feature]) === null || _TEXTURE_FEATURE_CHEC === void 0 ? void 0 : _TEXTURE_FEATURE_CHEC.call(TEXTURE_FEATURE_CHECKS, gl);
+  return ((_TEXTURE_FEATURE_CHEC = TEXTURE_FEATURE_CHECKS[feature]) === null || _TEXTURE_FEATURE_CHEC === void 0 ? void 0 : _TEXTURE_FEATURE_CHEC.call(TEXTURE_FEATURE_CHECKS, gl)) || false;
 }
-
 const checkTextureFeatures = (gl, features) => features.every(feature => checkTextureFeature(gl, feature));
-
 export function getTextureFeatures(gl) {
   const textureFeatures = Object.keys(TEXTURE_FEATURE_CHECKS);
   return textureFeatures.filter(feature => checkTextureFeature(gl, feature));
@@ -80,7 +74,8 @@ export const TEXTURE_FORMATS = {
   'r8unorm': {
     gl: GL.R8,
     b: 1,
-    c: 1
+    c: 1,
+    renderbuffer: true
   },
   'r8snorm': {
     gl: GL.R8_SNORM,
@@ -90,17 +85,20 @@ export const TEXTURE_FORMATS = {
   'r8uint': {
     gl: GL.R8UI,
     b: 1,
-    c: 1
+    c: 1,
+    renderbuffer: true
   },
   'r8sint': {
     gl: GL.R8I,
     b: 1,
-    c: 1
+    c: 1,
+    renderbuffer: true
   },
   'rg8unorm': {
     gl: GL.RG8,
     b: 2,
-    c: 2
+    c: 2,
+    renderbuffer: true
   },
   'rg8snorm': {
     gl: GL.RG8_SNORM,
@@ -110,67 +108,78 @@ export const TEXTURE_FORMATS = {
   'rg8uint': {
     gl: GL.RG8UI,
     b: 2,
-    c: 2
+    c: 2,
+    renderbuffer: true
   },
   'rg8sint': {
     gl: GL.RG8I,
     b: 2,
-    c: 2
+    c: 2,
+    renderbuffer: true
   },
   'r16uint': {
     gl: GL.R16UI,
     b: 2,
-    c: 1
+    c: 1,
+    renderbuffer: true
   },
   'r16sint': {
     gl: GL.R16I,
     b: 2,
-    c: 1
+    c: 1,
+    renderbuffer: true
   },
   'r16float': {
     gl: GL.R16F,
     b: 2,
     c: 1,
     render: 'texture-renderable-float16-webgl',
-    filter: 'texture-filter-linear-float16-webgl'
+    filter: 'texture-filter-linear-float16-webgl',
+    renderbuffer: true
   },
   'r16unorm-webgl': {
     gl: GL.R16_EXT,
     b: 2,
     c: 1,
-    f: 'texture-formats-norm16-webgl'
+    f: 'texture-formats-norm16-webgl',
+    renderbuffer: true,
+    x: EXT_TEXTURE_NORM16
   },
   'r16snorm-webgl': {
     gl: GL.R16_SNORM_EXT,
     b: 2,
     c: 1,
-    f: 'texture-formats-norm16-webgl'
+    f: 'texture-formats-norm16-webgl',
+    x: EXT_TEXTURE_NORM16
   },
   'rgba4unorm-webgl': {
     gl: GL.RGBA4,
     b: 2,
     c: 4,
-    wgpu: false
+    wgpu: false,
+    renderbuffer: true
   },
   'rgb565unorm-webgl': {
     gl: GL.RGB565,
     b: 2,
     c: 4,
-    wgpu: false
+    wgpu: false,
+    renderbuffer: true
   },
   'rgb5a1unorm-webgl': {
     gl: GL.RGB5_A1,
     b: 2,
     c: 4,
-    wgpu: false
+    wgpu: false,
+    renderbuffer: true
   },
-  'rbg8unorm-webgl': {
+  'rgb8unorm-webgl': {
     gl: GL.RGB8,
     b: 3,
     c: 3,
     wgpu: false
   },
-  'rbg8snorm-webgl': {
+  'rgb8snorm-webgl': {
     gl: GL.RGB8_SNORM,
     b: 3,
     c: 3,
@@ -234,31 +243,36 @@ export const TEXTURE_FORMATS = {
     b: 4,
     c: 2,
     render: 'texture-renderable-float16-webgl',
-    filter: 'texture-filter-linear-float16-webgl'
+    filter: 'texture-filter-linear-float16-webgl',
+    renderbuffer: true
   },
   'rg16unorm-webgl': {
     gl: GL.RG16_EXT,
     b: 2,
     c: 2,
-    f: 'texture-formats-norm16-webgl'
+    f: 'texture-formats-norm16-webgl',
+    x: EXT_TEXTURE_NORM16
   },
   'rg16snorm-webgl': {
     gl: GL.RG16_SNORM_EXT,
     b: 2,
     c: 2,
-    f: 'texture-formats-norm16-webgl'
+    f: 'texture-formats-norm16-webgl',
+    x: EXT_TEXTURE_NORM16
   },
   'r32uint': {
     gl: GL.R32UI,
     b: 4,
     c: 1,
-    bpp: 4
+    bpp: 4,
+    renderbuffer: true
   },
   'r32sint': {
     gl: GL.R32I,
     b: 4,
     c: 1,
-    bpp: 4
+    bpp: 4,
+    renderbuffer: true
   },
   'r32float': {
     gl: GL.R32F,
@@ -281,13 +295,15 @@ export const TEXTURE_FORMATS = {
     b: 4,
     c: 3,
     p: 1,
-    render: 'texture-renderable-float32-webgl'
+    render: 'texture-renderable-float32-webgl',
+    renderbuffer: true
   },
   'rgb10a2unorm': {
     gl: GL.RGB10_A2,
     b: 4,
     c: 4,
-    p: 1
+    p: 1,
+    renderbuffer: true
   },
   'rgb10a2unorm-webgl': {
     b: 4,
@@ -295,46 +311,54 @@ export const TEXTURE_FORMATS = {
     gl: GL.RGB10_A2UI,
     p: 1,
     wgpu: false,
-    bpp: 4
+    bpp: 4,
+    renderbuffer: true
   },
   'rgb16unorm-webgl': {
     gl: GL.RGB16_EXT,
     b: 2,
     c: 3,
-    f: 'texture-formats-norm16-webgl'
+    f: 'texture-formats-norm16-webgl',
+    x: EXT_TEXTURE_NORM16
   },
   'rgb16snorm-webgl': {
     gl: GL.RGB16_SNORM_EXT,
     b: 2,
     c: 3,
-    f: 'texture-formats-norm16-webgl'
+    f: 'texture-formats-norm16-webgl',
+    x: EXT_TEXTURE_NORM16
   },
   'rg32uint': {
     gl: GL.RG32UI,
     b: 8,
-    c: 2
+    c: 2,
+    renderbuffer: true
   },
   'rg32sint': {
     gl: GL.RG32I,
     b: 8,
-    c: 2
+    c: 2,
+    renderbuffer: true
   },
   'rg32float': {
     gl: GL.RG32F,
     b: 8,
     c: 2,
     render: 'texture-renderable-float32-webgl',
-    filter: 'texture-filter-linear-float32-webgl'
+    filter: 'texture-filter-linear-float32-webgl',
+    renderbuffer: true
   },
   'rgba16uint': {
     gl: GL.RGBA16UI,
     b: 8,
-    c: 4
+    c: 4,
+    renderbuffer: true
   },
   'rgba16sint': {
     gl: GL.RGBA16I,
     b: 8,
-    c: 4
+    c: 4,
+    renderbuffer: true
   },
   'rgba16float': {
     gl: GL.RGBA16F,
@@ -348,13 +372,16 @@ export const TEXTURE_FORMATS = {
     gl: GL.RGBA16_EXT,
     b: 2,
     c: 4,
-    f: 'texture-formats-norm16-webgl'
+    f: 'texture-formats-norm16-webgl',
+    renderbuffer: true,
+    x: EXT_TEXTURE_NORM16
   },
   'rgba16snorm-webgl': {
     gl: GL.RGBA16_SNORM_EXT,
     b: 2,
     c: 4,
-    f: 'texture-formats-norm16-webgl'
+    f: 'texture-formats-norm16-webgl',
+    x: EXT_TEXTURE_NORM16
   },
   'rgb32float-webgl': {
     gl: GL.RGB32F,
@@ -369,33 +396,38 @@ export const TEXTURE_FORMATS = {
   'rgba32uint': {
     gl: GL.RGBA32UI,
     b: 16,
-    c: 4
+    c: 4,
+    renderbuffer: true
   },
   'rgba32sint': {
     gl: GL.RGBA32I,
     b: 16,
-    c: 4
+    c: 4,
+    renderbuffer: true
   },
   'rgba32float': {
     gl: GL.RGBA32F,
-    gl1: GL.RGBA,
     b: 16,
     c: 4,
     render: 'texture-renderable-float32-webgl',
-    filter: 'texture-filter-linear-float32-webgl'
+    filter: 'texture-filter-linear-float32-webgl',
+    renderbuffer: true
   },
   'stencil8': {
     gl: GL.STENCIL_INDEX8,
+    gl1: GL.STENCIL_INDEX8,
     b: 1,
     c: 1,
-    attachment: GL.STENCIL_ATTACHMENT
+    attachment: GL.STENCIL_ATTACHMENT,
+    renderbuffer: true
   },
   'depth16unorm': {
     gl: GL.DEPTH_COMPONENT16,
     gl1: GL.DEPTH_COMPONENT16,
     b: 2,
     c: 1,
-    attachment: GL.DEPTH_ATTACHMENT
+    attachment: GL.DEPTH_ATTACHMENT,
+    renderbuffer: true
   },
   'depth24plus': {
     gl: GL.DEPTH_COMPONENT24,
@@ -407,29 +439,34 @@ export const TEXTURE_FORMATS = {
     gl: GL.DEPTH_COMPONENT32F,
     b: 4,
     c: 1,
-    attachment: GL.DEPTH_ATTACHMENT
+    attachment: GL.DEPTH_ATTACHMENT,
+    renderbuffer: true
   },
   'depth24plus-stencil8': {
-    b: 4,
-    gl: GL.UNSIGNED_INT_24_8,
+    gl: GL.DEPTH_STENCIL,
     gl1: GL.DEPTH_STENCIL,
+    b: 4,
     c: 2,
     p: 1,
-    attachment: GL.DEPTH_STENCIL_ATTACHMENT
+    attachment: GL.DEPTH_STENCIL_ATTACHMENT,
+    renderbuffer: true,
+    depthTexture: true
   },
   'depth24unorm-stencil8': {
     gl: GL.DEPTH24_STENCIL8,
     b: 4,
     c: 2,
     p: 1,
-    attachment: GL.DEPTH_STENCIL_ATTACHMENT
+    attachment: GL.DEPTH_STENCIL_ATTACHMENT,
+    renderbuffer: true
   },
-  "depth32float-stencil8": {
+  'depth32float-stencil8': {
     gl: GL.DEPTH32F_STENCIL8,
     b: 5,
     c: 2,
     p: 1,
-    attachment: GL.DEPTH_STENCIL_ATTACHMENT
+    attachment: GL.DEPTH_STENCIL_ATTACHMENT,
+    renderbuffer: true
   },
   'bc1-rgb-unorm-webgl': {
     gl: GL.COMPRESSED_RGB_S3TC_DXT1_EXT,
@@ -696,61 +733,81 @@ export const TEXTURE_FORMATS = {
     f: texture_compression_atc_webgl
   }
 };
-
-function getTextureFormat(format) {
-  if (typeof format === 'string') {
-    return format;
-  }
-
-  const entry = Object.entries(TEXTURE_FORMATS).find(([, entry]) => entry.gl === format || entry.gl1 === format);
-
-  if (!entry) {
-    throw new Error("Unknown texture format ".concat(format));
-  }
-
-  return entry[0];
-}
-
+const DATA_FORMAT_CHANNELS = {
+  [GL.RED]: 1,
+  [GL.RED_INTEGER]: 1,
+  [GL.RG]: 2,
+  [GL.RG_INTEGER]: 2,
+  [GL.RGB]: 3,
+  [GL.RGB_INTEGER]: 3,
+  [GL.RGBA]: 4,
+  [GL.RGBA_INTEGER]: 4,
+  [GL.DEPTH_COMPONENT]: 1,
+  [GL.DEPTH_STENCIL]: 1,
+  [GL.ALPHA]: 1,
+  [GL.LUMINANCE]: 1,
+  [GL.LUMINANCE_ALPHA]: 2
+};
+const TYPE_SIZES = {
+  [GL.FLOAT]: 4,
+  [GL.UNSIGNED_INT]: 4,
+  [GL.INT]: 4,
+  [GL.UNSIGNED_SHORT]: 2,
+  [GL.SHORT]: 2,
+  [GL.HALF_FLOAT]: 2,
+  [GL.BYTE]: 1,
+  [GL.UNSIGNED_BYTE]: 1
+};
 export function isTextureFormatSupported(gl, formatOrGL) {
-  const format = getTextureFormat(formatOrGL);
+  const format = convertGLToTextureFormat(formatOrGL);
   const info = TEXTURE_FORMATS[format];
-
   if (!info) {
     return false;
   }
-
   if (isWebGL2(gl) ? info.gl === undefined : info.gl1 === undefined) {
     return false;
   }
-
   const extension = info.x || (isWebGL2(gl) ? info.gl2ext || info.gl1ext : info.gl1ext);
-
   if (extension) {
     return Boolean(gl.getExtension(extension));
   }
-
   return true;
 }
+export function isRenderbufferFormatSupported(gl, format) {
+  var _TEXTURE_FORMATS$form;
+  return isTextureFormatSupported(gl, format) && ((_TEXTURE_FORMATS$form = TEXTURE_FORMATS[format]) === null || _TEXTURE_FORMATS$form === void 0 ? void 0 : _TEXTURE_FORMATS$form.renderbuffer);
+}
+export function convertGLToTextureFormat(format) {
+  if (typeof format === 'string') {
+    return format;
+  }
+  const entry = Object.entries(TEXTURE_FORMATS).find(_ref => {
+    let [, entry] = _ref;
+    return entry.gl === format || entry.gl1 === format;
+  });
+  if (!entry) {
+    throw new Error(`Unknown texture format ${format}`);
+  }
+  return entry[0];
+}
+export function convertTextureFormatToGL(format, isWebGL2) {
+  const formatInfo = TEXTURE_FORMATS[format];
+  const webglFormat = isWebGL2 ? formatInfo === null || formatInfo === void 0 ? void 0 : formatInfo.gl : formatInfo === null || formatInfo === void 0 ? void 0 : formatInfo.gl1;
+  if (webglFormat === undefined) {
+    throw new Error(`Unsupported texture format ${format}`);
+  }
+  return webglFormat;
+}
 export function getTextureFormatSupport(gl, formatOrGL) {
-  const format = getTextureFormat(formatOrGL);
+  const format = convertGLToTextureFormat(formatOrGL);
   const info = TEXTURE_FORMATS[format];
-
   if (!info) {
     return {
       supported: false
     };
   }
-
-  let decoded;
-
-  try {
-    decoded = decodeTextureFormat(format);
-  } catch {}
-
   let supported = isWebGL2(gl) ? info.gl === undefined : info.gl1 === undefined;
   supported = supported && checkTextureFeatures(gl, [info.f]);
-  const filterable = info.filter ? checkTextureFeatures(gl, [info.filter]) : decoded && !decoded.signed;
-  const renderable = info.filter ? checkTextureFeatures(gl, [info.render]) : decoded && !decoded.signed;
   return {
     supported,
     renderable: supported && checkTextureFeatures(gl, [info.render]),
@@ -760,91 +817,60 @@ export function getTextureFormatSupport(gl, formatOrGL) {
   };
 }
 export function isTextureFormatFilterable(gl, formatOrGL) {
-  const format = getTextureFormat(formatOrGL);
-
+  const format = convertGLToTextureFormat(formatOrGL);
   if (!isTextureFormatSupported(gl, format)) {
     return false;
   }
-
   try {
     const decoded = decodeTextureFormat(format);
-
     if (decoded.signed) {
       return false;
     }
   } catch {
     return false;
   }
-
   if (format.endsWith('32float')) {
     return Boolean(gl.getExtension('OES_texture_float_linear'));
   }
-
   if (format.endsWith('16float')) {
     return Boolean(gl.getExtension('OES_texture_half_float_linear'));
   }
-
   return true;
 }
 export function isTextureFormatRenderable(gl, formatOrGL) {
-  const format = getTextureFormat(formatOrGL);
-
+  const format = convertGLToTextureFormat(formatOrGL);
   if (!isTextureFormatSupported(gl, format)) {
     return false;
   }
-
   if (typeof format === 'number') {
     return false;
   }
-
   return true;
 }
-export function getWebGLTextureFormat(gl, formatOrGL) {
-  const format = getTextureFormat(formatOrGL);
-  const formatInfo = TEXTURE_FORMATS[format];
-  const webglFormat = isWebGL2(gl) ? formatInfo === null || formatInfo === void 0 ? void 0 : formatInfo.gl : formatInfo === null || formatInfo === void 0 ? void 0 : formatInfo.gl1;
-
-  if (typeof format === 'number') {
-    return webglFormat || format;
-  }
-
-  if (webglFormat === undefined) {
-    throw new Error("Unsupported texture format ".concat(format));
-  }
-
-  return webglFormat;
-}
-export function getWebGLTextureParameters(gl, formatOrGL) {
-  const format = getTextureFormat(formatOrGL);
-  const webglFormat = getWebGLTextureFormat(gl, format);
+export function getWebGLTextureParameters(formatOrGL, isWebGL2) {
+  const format = convertGLToTextureFormat(formatOrGL);
+  const webglFormat = convertTextureFormatToGL(format, isWebGL2);
   const decoded = decodeTextureFormat(format);
   return {
     format: webglFormat,
     dataFormat: getWebGLPixelDataFormat(decoded.format, decoded.integer, decoded.normalized, webglFormat),
-    type: getWebGLDataType(decoded.dataType),
+    type: decoded.dataType ? getGLFromVertexType(decoded.dataType) : GL.UNSIGNED_BYTE,
     compressed: decoded.compressed
   };
 }
-export function getWebGLDepthStencilAttachment(formatOrGL) {
-  const format = getTextureFormat(formatOrGL);
-
-  if (typeof format === 'number') {
-    throw new Error('unsupported depth stencil format');
-  }
-
+export function getDepthStencilAttachmentWebGL(format) {
   const info = TEXTURE_FORMATS[format];
-  const attachment = info.attachment;
-
-  if (!attachment) {
-    throw new Error('not a depth stencil format');
+  if (!(info !== null && info !== void 0 && info.attachment)) {
+    throw new Error(`${format} is not a depth stencil format`);
   }
-
-  return attachment;
+  return info.attachment;
 }
-export function _checkFloat32ColorAttachment(gl, internalFormat = gl.RGBA, srcFormat = GL.RGBA, srcType = GL.UNSIGNED_BYTE) {
-  let texture;
-  let framebuffer;
-
+export function _checkFloat32ColorAttachment(gl) {
+  let internalFormat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : gl.RGBA;
+  let srcFormat = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : GL.RGBA;
+  let srcType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : GL.UNSIGNED_BYTE;
+  let texture = null;
+  let framebuffer = null;
   try {
     texture = gl.createTexture();
     gl.bindTexture(GL.TEXTURE_2D, texture);
@@ -865,90 +891,28 @@ export function _checkFloat32ColorAttachment(gl, internalFormat = gl.RGBA, srcFo
     gl.deleteFramebuffer(framebuffer);
   }
 }
-const DATA_FORMAT_CHANNELS = {
-  [GL.RED]: 1,
-  [GL.RED_INTEGER]: 1,
-  [GL.RG]: 2,
-  [GL.RG_INTEGER]: 2,
-  [GL.RGB]: 3,
-  [GL.RGB_INTEGER]: 3,
-  [GL.RGBA]: 4,
-  [GL.RGBA_INTEGER]: 4,
-  [GL.DEPTH_COMPONENT]: 1,
-  [GL.DEPTH_STENCIL]: 1,
-  [GL.ALPHA]: 1,
-  [GL.LUMINANCE]: 1,
-  [GL.LUMINANCE_ALPHA]: 2
-};
-const TYPE_SIZES = {
-  [GL.FLOAT]: 4,
-  [GL.UNSIGNED_INT]: 4,
-  [GL.INT]: 4,
-  [GL.UNSIGNED_SHORT]: 2,
-  [GL.SHORT]: 2,
-  [GL.HALF_FLOAT]: 2,
-  [GL.BYTE]: 1,
-  [GL.UNSIGNED_BYTE]: 1
-};
-export function getTextureFormatBytesPerPixel(gl, formatOrGL) {
-  const format = getTextureFormat(formatOrGL);
-  const params = getWebGLTextureParameters(gl, format);
+export function getTextureFormatBytesPerPixel(formatOrGL, isWebGL2) {
+  const format = convertGLToTextureFormat(formatOrGL);
+  const params = getWebGLTextureParameters(format, isWebGL2);
   const channels = DATA_FORMAT_CHANNELS[params.dataFormat] || 4;
   const channelSize = TYPE_SIZES[params.type] || 1;
   return channels * channelSize;
 }
-
 function getWebGLPixelDataFormat(dataFormat, integer, normalized, format) {
   if (format === GL.RGBA || format === GL.RGB) {
     return format;
   }
-
   switch (dataFormat) {
     case 'r':
       return integer && !normalized ? GL.RED_INTEGER : GL.RED;
-
     case 'rg':
       return integer && !normalized ? GL.RG_INTEGER : GL.RG;
-
     case 'rgb':
       return integer && !normalized ? GL.RGB_INTEGER : GL.RGB;
-
     case 'rgba':
       return integer && !normalized ? GL.RGBA_INTEGER : GL.RGBA;
-
     default:
       return GL.RGBA;
   }
 }
-
-export function getWebGLDataType(dataType) {
-  switch (dataType) {
-    case 'uint8':
-      return GL.UNSIGNED_BYTE;
-
-    case 'sint8':
-      return GL.BYTE;
-
-    case 'uint16':
-      return GL.UNSIGNED_SHORT;
-
-    case 'sint16':
-      return GL.SHORT;
-
-    case 'uint32':
-      return GL.UNSIGNED_INT;
-
-    case 'sint32':
-      return GL.INT;
-
-    case 'float16':
-      return GL.HALF_FLOAT;
-
-    case 'float32':
-      return GL.FLOAT;
-
-    default:
-      return GL.UNSIGNED_BYTE;
-  }
-}
 //# sourceMappingURL=texture-formats.js.map