ris-framework 0.2.0-dev.11 → 0.2.0-dev.13

package/src/api/rendering/renderer-interface.ts

@@ -1,56 +1,21 @@
 import { vec2 } from "gl-matrix";
-import { TextureSamplerFilteringPreset } from "../../core/rendering/enums.ts";
 import type {RenderingLimits} from "./rendering-limits.ts";
-import type {Color, IGraphicsDevice, IRenderer} from "../index.ts";
+import type { IRenderer} from "../index.ts";
 import type {TextureFormat} from "../index.ts";
-import {PowerPreferenceType} from "./PowerPreference.ts";
 
-export const RenderConfigurationSymbol = Symbol("RenderConfiguration");
 
-/**
- * The configuration for the renderer. This is used to initialize the renderer.
- * @internal
- */
-export interface IRendererConfiguration {
-
-    /**The size of the main frame buffer. */
-    backBufferSize: vec2;
 
-    /** Should back buffer use alpha. */
-    alpha: boolean;
-
-    /** The preference when it comes to selecting GPU device. Only makes sense to set on multi-GPU devices. */
-    powerPreference: PowerPreferenceType;
-
-    /**
-     * The preset for texture sampler filtering.
-     *  This is used to configure the default texture sampler in the graphics device. 
-     * The default texture sampler is used when a texture is sampled without a specific sampler being bound.
-     */
-    textureFiltering: TextureSamplerFilteringPreset;
-}
 
 /**
  * The interface for renderers.
  */
 export interface ITempRenderer extends IRenderer {
 
-    /**
-     * The clear color used by the renderer.
-     */
-    clearColor: Color
-
     /**
      * The rendering limits of the renderer.
      */
     limits: RenderingLimits | null;
 
-    /**
-     * The graphics device used by the renderer. 
-     * This is used to create resources and manage the rendering context.
-     */
-    readonly graphicsDevice: IGraphicsDevice;
-
     /**
      * The preferred texture format for the renderer.
      * @returns The preferred texture format for the renderer.

package/src/api/rendering/renderpass/RenderPassDescriptor.ts

@@ -6,21 +6,17 @@ import {RenderPassColorAttachment} from "./RenderPassColorAttachment.ts";
  */
 export class RenderPassDescriptor {
 
-/**
- * The color attachments of the render pass.
- */
-  public colorAttachments?: RenderPassColorAttachment[];
+    /** The color attachments of the render pass. */
+    public colorAttachments?: RenderPassColorAttachment[];
 
-/**
- * The depth-stencil attachment of the render pass.
- */
-  public  depthStencilAttachment?: RenderPassDepthStencilAttachment;
+    /** The depth-stencil attachment of the render pass. */
+    public depthStencilAttachment?: RenderPassDepthStencilAttachment;
 
-/**
- * The label of the render pass.
- * This is used for debugging purposes and can be set to any string that helps identify the render pass in graphics debuggers or profiling tools.
- * It does not affect the functionality of the render pass and can be left empty if not needed.
- */
-  public label?: string;
+    /**
+     * The label of the render pass.
+     * This is used for debugging purposes and can be set to any string that helps identify the render pass in graphics debuggers or profiling tools.
+     * It does not affect the functionality of the render pass and can be left empty if not needed.
+     */
+    public label?: string;
 
 }

package/src/api/rendering/swapchain/ISwapChain.ts

@@ -12,9 +12,7 @@ export interface ISwapChain extends IDisposable {
      */
     readonly backBufferSize: vec2;
 
-    /**
-     * The texture format of the back buffer.
-     */
+    /** The texture format of the back buffer. */
     readonly textureFormat: TextureFormat;
 
     /**

package/src/api/rendering/texture/TextureFormat.ts

@@ -6,53 +6,167 @@ export enum TextureFormat {
      * Default value.
      For unknown texture format.
      */
-    UNDEFINED = 0,
+    UNDEFINED = "UNDEFINED",
 
     /**
      * Red, green, blue, and alpha channels.
      * 8-bit integer per channel.
      * [0, 255] converted to/from float [0, 1] in shader.
      * */
-    RGBA_8_UNORM = 1,
+    RGBA_8_UNORM = "RGBA_8_UNORM",
 
     /**
      * Red, green, blue, and alpha channels.
      * 8-bit integer per channel.
      * Srgb-color [0, 255] converted to/from linear-color float [0, 1] in shader.
      */
-    RGBA_8_UNORM_SRGB = 2,
+    RGBA_8_UNORM_SRGB = "RGBA_8_UNORM_SRGB",
 
     /**
      * Depth 24 and stencil 8.
      */
-    DEPTH_24_STENCIL_8 = 3,
+    DEPTH_24_STENCIL_8 = "DEPTH_24_STENCIL_8",
 
     /**
      * The depth 32 float.
      */
-    DEPTH_32_FLOAT = 4,
+    DEPTH_32_FLOAT = "DEPTH_32_FLOAT_8",
 
-    RED_32_FLOAT = 5,
+    RED_32_FLOAT = "RED_32_FLOAT_8",
     /**
      * The 32-bit float format with one red component. It is typeless.
 
      Valid only for D3D11.
      */
-    RED_32_TYPELESS = 6,
+    RED_32_TYPELESS = "RED_32_TYPELE_8",
     /**
      * The BC7 compressed format with four 8-bit normalized unsigned integer components in RGBA order.
      */
-    BC7_RGBA_UNORM = 7,
+    BC7_RGBA_UNORM = "BC7_RGBA_UNORM",
     /**
      * The BC3 compressed format with four 8-bit normalized unsigned integer components in RGBA order.
      */
-    BC3_RGBA_UNORM = 8,
+    BC3_RGBA_UNORM = "BC3_RGBA_UNORM",
     /**
      * The ETC2 compressed format with four 8-bit normalized unsigned integer components in RGBA order.
      */
-    ETC2_RGBA8_UNORM = 9,
-    /**
-     * The ASTC 4x4 compressed format with four 8-bit normalized unsigned integer components in RGBA order.
-     */
-    ASTC_4X4_RGBA = 10
+    ETC2_RGBA8_UNORM = "ETC2_RGBA8_UNORM",
+
+    /** BC7 RGBA, sRGB. Requires EXT_texture_compression_bptc (WebGL) or texture-compression-bc (WebGPU). */
+    BC7_RGBA_SRGB = "BC7_RGBA_SRGB",
+
+    /** BC3 (DXT5) RGBA, sRGB. Requires WEBGL_compressed_texture_s3tc_srgb (WebGL) or texture-compression-bc (WebGPU). */
+    BC3_RGBA_SRGB = "BC3_RGBA_SRGB",
+
+    /** BC1 (DXT1) RGB. Requires WEBGL_compressed_texture_s3tc (WebGL) or texture-compression-bc (WebGPU). */
+    BC1_RGB_UNORM = "BC1_RGB_UNORM",
+
+    /** BC1 (DXT1) RGB, sRGB. Requires WEBGL_compressed_texture_s3tc_srgb (WebGL). WebGPU only has BC1 RGBA, which is used instead. */
+    BC1_RGB_SRGB = "BC1_RGB_SRGB",
+
+    /** ETC2 RGBA8 with EAC alpha, sRGB. Requires WEBGL_compressed_texture_etc (WebGL) or texture-compression-etc2 (WebGPU). */
+    ETC2_RGBA8_SRGB = "ETC2_RGBA8_SRGB",
+
+    /** ETC2 RGB8. Requires WEBGL_compressed_texture_etc (WebGL) or texture-compression-etc2 (WebGPU). */
+    ETC2_RGB8_UNORM = "ETC2_RGB8_UNORM",
+
+    /** ETC2 RGB8, sRGB. Requires WEBGL_compressed_texture_etc (WebGL) or texture-compression-etc2 (WebGPU). */
+    ETC2_RGB8_SRGB = "ETC2_RGB8_SRGB",
+
+
+    /** The ASTC 4x4 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_4X4_RGBA_UNORM = "ASTC_4X4_RGBA_UNORM",
+
+    /** The ASTC 4x4 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_4X4_RGBA_SRGB = "ASTC_4X4_RGBA_SRGB",
+
+    /** The ASTC 5x4 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_5X4_RGBA_UNORM = "ASTC_5X4_RGBA_UNORM",
+
+    /** The ASTC 5x4 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_5X4_RGBA_SRGB = "ASTC_5X4_RGBA_SRGB",
+
+    /** The ASTC 5x5 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_5X5_RGBA_UNORM = "ASTC_5X5_RGBA_UNORM",
+
+    /** The ASTC 5x5 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_5X5_RGBA_SRGB = "ASTC_5X5_RGBA_SRGB",
+
+    /** The ASTC 6x5 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_6X5_RGBA_UNORM = "ASTC_6X5_RGBA_UNORM",
+
+    /** The ASTC 6x5 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_6X5_RGBA_SRGB = "ASTC_6X5_RGBA_SRGB",
+
+    /** The ASTC 6x6 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_6X6_RGBA_UNORM = "ASTC_6X6_RGBA_UNORM",
+
+    /** The ASTC 6x6 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_6X6_RGBA_SRGB = "ASTC_6X6_RGBA_SRGB",
+
+    /** The ASTC 8x5 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_8X5_RGBA_UNORM = "ASTC_8X5_RGBA_UNORM",
+
+    /** The ASTC 8x5 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_8X5_RGBA_SRGB = "ASTC_8X5_RGBA_SRGB",
+
+    /** The ASTC 8x6 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_8X6_RGBA_UNORM = "ASTC_8X6_RGBA_UNORM",
+
+    /** The ASTC 8x6 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_8X6_RGBA_SRGB = "ASTC_8X6_RGBA_SRGB",
+
+    /** The ASTC 8x8 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_8X8_RGBA_UNORM = "ASTC_8X8_RGBA_UNORM",
+
+    /** The ASTC 8x8 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_8X8_RGBA_SRGB = "ASTC_8X8_RGBA_SRGB",
+
+    /** The ASTC 10x5 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_10X5_RGBA_UNORM = "ASTC_10X5_RGBA_UNORM",
+
+    /** The ASTC 10x5 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_10X5_RGBA_SRGB = "ASTC_10X5_RGBA_SRGB",
+
+    /** The ASTC 10x6 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_10X6_RGBA_UNORM = "ASTC_10X6_RGBA_UNORM",
+
+    /** The ASTC 10x6 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_10X6_RGBA_SRGB = "ASTC_10X6_RGBA_SRGB",
+
+    /** The ASTC 10x8 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_10X8_RGBA_UNORM = "ASTC_10X8_RGBA_UNORM",
+
+    /** The ASTC 10x8 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_10X8_RGBA_SRGB = "ASTC_10X8_RGBA_SRGB",
+
+    /** The ASTC 10x10 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_10X10_RGBA_UNORM = "ASTC_10X10_RGBA_UNORM",
+
+    /** The ASTC 10x10 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_10X10_RGBA_SRGB = "ASTC_10X10_RGBA_SRGB",
+
+    /** The ASTC 12x10 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_12X10_RGBA_UNORM = "ASTC_12X10_RGBA_UNORM",
+
+    /** The ASTC 12x10 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_12X10_RGBA_SRGB = "ASTC_12X10_RGBA_SRGB",
+
+    /** The ASTC 12x12 compressed format with four 8-bit normalized unsigned integer components in RGBA order. */
+    ASTC_12X12_RGBA_UNORM = "ASTC_12X12_RGBA_UNORM",
+
+    /** The ASTC 12x12 compressed format with four 8-bit normalized unsigned integer components in RGBA order, sRGB-encoded color. */
+    ASTC_12X12_RGBA_SRGB = "ASTC_12X12_RGBA_SRGB",
+
+    /** The PVRTC1 compressed format at 4 bits per pixel with RGBA components. Requires WEBGL_compressed_texture_pvrtc. */
+    PVRTC_4BPPV1_RGBA = "PVRTC_4BPPV1_RGBA",
+
+    /** The PVRTC1 compressed format at 4 bits per pixel with RGB components. Requires WEBGL_compressed_texture_pvrtc. */
+    PVRTC_4BPPV1_RGB = "PVRTC_4BPPV1_RGB",
+
+    /** The PVRTC1 compressed format at 2 bits per pixel with RGBA components. Requires WEBGL_compressed_texture_pvrtc. */
+    PVRTC_2BPPV1_RGBA = "PVRTC_2BPPV1_RGBA",
+
+    /** The PVRTC1 compressed format at 2 bits per pixel with RGB components. Requires WEBGL_compressed_texture_pvrtc. */
+    PVRTC_2BPPV1_RGB = "PVRTC_2BPPV1_RGB",
 }

package/src/api/rendering/texture/TextureUtilities.ts

@@ -8,36 +8,199 @@ import {AlignUtilities} from "../../utilities/AlignUtilities.ts";
 export class TextureUtilities {
 
     private static readonly _compressedTextureFormats = [
-        TextureFormat.ASTC_4X4_RGBA,
+
+        // ASTC
+        TextureFormat.ASTC_4X4_RGBA_UNORM,
+        TextureFormat.ASTC_4X4_RGBA_SRGB,
+        TextureFormat.ASTC_5X4_RGBA_UNORM,
+        TextureFormat.ASTC_5X4_RGBA_SRGB,
+        TextureFormat.ASTC_5X5_RGBA_UNORM,
+        TextureFormat.ASTC_5X5_RGBA_SRGB,
+        TextureFormat.ASTC_6X5_RGBA_UNORM,
+        TextureFormat.ASTC_6X5_RGBA_SRGB,
+        TextureFormat.ASTC_6X6_RGBA_UNORM,
+        TextureFormat.ASTC_6X6_RGBA_SRGB,
+        TextureFormat.ASTC_8X5_RGBA_UNORM,
+        TextureFormat.ASTC_8X5_RGBA_SRGB,
+        TextureFormat.ASTC_8X6_RGBA_UNORM,
+        TextureFormat.ASTC_8X6_RGBA_SRGB,
+        TextureFormat.ASTC_8X8_RGBA_UNORM,
+        TextureFormat.ASTC_8X8_RGBA_SRGB,
+        TextureFormat.ASTC_10X5_RGBA_UNORM,
+        TextureFormat.ASTC_10X5_RGBA_SRGB,
+        TextureFormat.ASTC_10X6_RGBA_UNORM,
+        TextureFormat.ASTC_10X6_RGBA_SRGB,
+        TextureFormat.ASTC_10X8_RGBA_UNORM,
+        TextureFormat.ASTC_10X8_RGBA_SRGB,
+        TextureFormat.ASTC_10X10_RGBA_UNORM,
+        TextureFormat.ASTC_10X10_RGBA_SRGB,
+        TextureFormat.ASTC_12X10_RGBA_UNORM,
+        TextureFormat.ASTC_12X10_RGBA_SRGB,
+        TextureFormat.ASTC_12X12_RGBA_UNORM,
+        TextureFormat.ASTC_12X12_RGBA_SRGB,
+
+        // PVRTC
+        TextureFormat.PVRTC_4BPPV1_RGBA,
+        TextureFormat.PVRTC_4BPPV1_RGB,
+        TextureFormat.PVRTC_2BPPV1_RGBA,
+        TextureFormat.PVRTC_2BPPV1_RGB,
+
         TextureFormat.BC3_RGBA_UNORM,
         TextureFormat.BC7_RGBA_UNORM,
-        TextureFormat.ETC2_RGBA8_UNORM
+        TextureFormat.ETC2_RGBA8_UNORM,
+
+        // sRGB and RGB variants
+        TextureFormat.BC7_RGBA_SRGB,
+        TextureFormat.BC3_RGBA_SRGB,
+        TextureFormat.BC1_RGB_UNORM,
+        TextureFormat.BC1_RGB_SRGB,
+        TextureFormat.ETC2_RGBA8_SRGB,
+        TextureFormat.ETC2_RGB8_UNORM,
+        TextureFormat.ETC2_RGB8_SRGB,
     ];
-    private static readonly _vkFormatTextureFormat: { [key: number]: number } = {
+
+    /** Linear compressed format → its sRGB variant. */
+    private static readonly _srgbVariant: { [key: string]: TextureFormat } = {
+        [TextureFormat.RGBA_8_UNORM]: TextureFormat.RGBA_8_UNORM_SRGB,
+        [TextureFormat.BC7_RGBA_UNORM]: TextureFormat.BC7_RGBA_SRGB,
+        [TextureFormat.BC3_RGBA_UNORM]: TextureFormat.BC3_RGBA_SRGB,
+        [TextureFormat.BC1_RGB_UNORM]: TextureFormat.BC1_RGB_SRGB,
+        [TextureFormat.ETC2_RGBA8_UNORM]: TextureFormat.ETC2_RGBA8_SRGB,
+        [TextureFormat.ETC2_RGB8_UNORM]: TextureFormat.ETC2_RGB8_SRGB,
+        [TextureFormat.ASTC_4X4_RGBA_UNORM]: TextureFormat.ASTC_4X4_RGBA_SRGB,
+        [TextureFormat.ASTC_5X4_RGBA_UNORM]: TextureFormat.ASTC_5X4_RGBA_SRGB,
+        [TextureFormat.ASTC_5X5_RGBA_UNORM]: TextureFormat.ASTC_5X5_RGBA_SRGB,
+        [TextureFormat.ASTC_6X5_RGBA_UNORM]: TextureFormat.ASTC_6X5_RGBA_SRGB,
+        [TextureFormat.ASTC_6X6_RGBA_UNORM]: TextureFormat.ASTC_6X6_RGBA_SRGB,
+        [TextureFormat.ASTC_8X5_RGBA_UNORM]: TextureFormat.ASTC_8X5_RGBA_SRGB,
+        [TextureFormat.ASTC_8X6_RGBA_UNORM]: TextureFormat.ASTC_8X6_RGBA_SRGB,
+        [TextureFormat.ASTC_8X8_RGBA_UNORM]: TextureFormat.ASTC_8X8_RGBA_SRGB,
+        [TextureFormat.ASTC_10X5_RGBA_UNORM]: TextureFormat.ASTC_10X5_RGBA_SRGB,
+        [TextureFormat.ASTC_10X6_RGBA_UNORM]: TextureFormat.ASTC_10X6_RGBA_SRGB,
+        [TextureFormat.ASTC_10X8_RGBA_UNORM]: TextureFormat.ASTC_10X8_RGBA_SRGB,
+        [TextureFormat.ASTC_10X10_RGBA_UNORM]: TextureFormat.ASTC_10X10_RGBA_SRGB,
+        [TextureFormat.ASTC_12X10_RGBA_UNORM]: TextureFormat.ASTC_12X10_RGBA_SRGB,
+        [TextureFormat.ASTC_12X12_RGBA_UNORM]: TextureFormat.ASTC_12X12_RGBA_SRGB,
+    };
+    private static readonly _vkFormatTextureFormat: { [key: number]: TextureFormat } = {
         [VkFormat.R8G8B8A8_UNORM]: TextureFormat.RGBA_8_UNORM,
         [VkFormat.R8G8B8A8_SRGB]: TextureFormat.RGBA_8_UNORM_SRGB,
         [VkFormat.BC7_UNORM_BLOCK]: TextureFormat.BC7_RGBA_UNORM,
-        [VkFormat.ASTC_4X4_UNORM_BLOCK]: TextureFormat.ASTC_4X4_RGBA,
+
+        // ASTC
+        [VkFormat.ASTC_4X4_UNORM_BLOCK]: TextureFormat.ASTC_4X4_RGBA_UNORM,
+        [VkFormat.ASTC_4X4_SRGB_BLOCK]: TextureFormat.ASTC_4X4_RGBA_SRGB,
+        [VkFormat.ASTC_5X4_UNORM_BLOCK]: TextureFormat.ASTC_5X4_RGBA_UNORM,
+        [VkFormat.ASTC_5X4_SRGB_BLOCK]: TextureFormat.ASTC_5X4_RGBA_SRGB,
+        [VkFormat.ASTC_5X5_UNORM_BLOCK]: TextureFormat.ASTC_5X5_RGBA_UNORM,
+        [VkFormat.ASTC_5X5_SRGB_BLOCK]: TextureFormat.ASTC_5X5_RGBA_SRGB,
+        [VkFormat.ASTC_6X5_UNORM_BLOCK]: TextureFormat.ASTC_6X5_RGBA_UNORM,
+        [VkFormat.ASTC_6X5_SRGB_BLOCK]: TextureFormat.ASTC_6X5_RGBA_SRGB,
+        [VkFormat.ASTC_6X6_UNORM_BLOCK]: TextureFormat.ASTC_6X6_RGBA_UNORM,
+        [VkFormat.ASTC_6X6_SRGB_BLOCK]: TextureFormat.ASTC_6X6_RGBA_SRGB,
+        [VkFormat.ASTC_8X5_UNORM_BLOCK]: TextureFormat.ASTC_8X5_RGBA_UNORM,
+        [VkFormat.ASTC_8X5_SRGB_BLOCK]: TextureFormat.ASTC_8X5_RGBA_SRGB,
+        [VkFormat.ASTC_8X6_UNORM_BLOCK]: TextureFormat.ASTC_8X6_RGBA_UNORM,
+        [VkFormat.ASTC_8X6_SRGB_BLOCK]: TextureFormat.ASTC_8X6_RGBA_SRGB,
+        [VkFormat.ASTC_8X8_UNORM_BLOCK]: TextureFormat.ASTC_8X8_RGBA_UNORM,
+        [VkFormat.ASTC_8X8_SRGB_BLOCK]: TextureFormat.ASTC_8X8_RGBA_SRGB,
+        [VkFormat.ASTC_10X5_UNORM_BLOCK]: TextureFormat.ASTC_10X5_RGBA_UNORM,
+        [VkFormat.ASTC_10X5_SRGB_BLOCK]: TextureFormat.ASTC_10X5_RGBA_SRGB,
+        [VkFormat.ASTC_10X6_UNORM_BLOCK]: TextureFormat.ASTC_10X6_RGBA_UNORM,
+        [VkFormat.ASTC_10X6_SRGB_BLOCK]: TextureFormat.ASTC_10X6_RGBA_SRGB,
+        [VkFormat.ASTC_10X8_UNORM_BLOCK]: TextureFormat.ASTC_10X8_RGBA_UNORM,
+        [VkFormat.ASTC_10X8_SRGB_BLOCK]: TextureFormat.ASTC_10X8_RGBA_SRGB,
+        [VkFormat.ASTC_10X10_UNORM_BLOCK]: TextureFormat.ASTC_10X10_RGBA_UNORM,
+        [VkFormat.ASTC_10X10_SRGB_BLOCK]: TextureFormat.ASTC_10X10_RGBA_SRGB,
+        [VkFormat.ASTC_12X10_UNORM_BLOCK]: TextureFormat.ASTC_12X10_RGBA_UNORM,
+        [VkFormat.ASTC_12X10_SRGB_BLOCK]: TextureFormat.ASTC_12X10_RGBA_SRGB,
+        [VkFormat.ASTC_12X12_UNORM_BLOCK]: TextureFormat.ASTC_12X12_RGBA_UNORM,
+        [VkFormat.ASTC_12X12_SRGB_BLOCK]: TextureFormat.ASTC_12X12_RGBA_SRGB,
+
         [VkFormat.BC3_UNORM_BLOCK]: TextureFormat.BC3_RGBA_UNORM,
         [VkFormat.ETC2_R8G8B8A8_UNORM_BLOCK]: TextureFormat.ETC2_RGBA8_UNORM,
+        [VkFormat.PVRTC1_4BPP_UNORM_BLOCK_IMG]: TextureFormat.PVRTC_4BPPV1_RGBA,
+
+        // sRGB and RGB variants
+        [VkFormat.BC7_SRGB_BLOCK]: TextureFormat.BC7_RGBA_SRGB,
+        [VkFormat.BC3_SRGB_BLOCK]: TextureFormat.BC3_RGBA_SRGB,
+        [VkFormat.BC1_RGB_UNORM_BLOCK]: TextureFormat.BC1_RGB_UNORM,
+        [VkFormat.BC1_RGB_SRGB_BLOCK]: TextureFormat.BC1_RGB_SRGB,
+        [VkFormat.ETC2_R8G8B8A8_SRGB_BLOCK]: TextureFormat.ETC2_RGBA8_SRGB,
+        [VkFormat.ETC2_R8G8B8_UNORM_BLOCK]: TextureFormat.ETC2_RGB8_UNORM,
+        [VkFormat.ETC2_R8G8B8_SRGB_BLOCK]: TextureFormat.ETC2_RGB8_SRGB,
+
     }
 
-    private static readonly _textureFormatVkFormat: { [key: number]: number } = {
+    private static readonly _textureFormatVkFormat: { [key: string]: number } = {
         [TextureFormat.RGBA_8_UNORM]: VkFormat.R8G8B8A8_UNORM,
         [TextureFormat.RGBA_8_UNORM_SRGB]: VkFormat.R8G8B8A8_SRGB,
         [TextureFormat.DEPTH_24_STENCIL_8]: VkFormat.D24_UNORM_S8_UINT,
         [TextureFormat.BC3_RGBA_UNORM]: VkFormat.BC3_UNORM_BLOCK,
         [TextureFormat.BC7_RGBA_UNORM]: VkFormat.BC7_UNORM_BLOCK,
-        [TextureFormat.ASTC_4X4_RGBA]: VkFormat.ASTC_4X4_UNORM_BLOCK,
+
+        // ASTC
+        [TextureFormat.ASTC_4X4_RGBA_UNORM]: VkFormat.ASTC_4X4_UNORM_BLOCK,
+        [TextureFormat.ASTC_4X4_RGBA_SRGB]: VkFormat.ASTC_4X4_SRGB_BLOCK,
+        [TextureFormat.ASTC_5X4_RGBA_UNORM]: VkFormat.ASTC_5X4_UNORM_BLOCK,
+        [TextureFormat.ASTC_5X4_RGBA_SRGB]: VkFormat.ASTC_5X4_SRGB_BLOCK,
+        [TextureFormat.ASTC_5X5_RGBA_UNORM]: VkFormat.ASTC_5X5_UNORM_BLOCK,
+        [TextureFormat.ASTC_5X5_RGBA_SRGB]: VkFormat.ASTC_5X5_SRGB_BLOCK,
+        [TextureFormat.ASTC_6X5_RGBA_UNORM]: VkFormat.ASTC_6X5_UNORM_BLOCK,
+        [TextureFormat.ASTC_6X5_RGBA_SRGB]: VkFormat.ASTC_6X5_SRGB_BLOCK,
+        [TextureFormat.ASTC_6X6_RGBA_UNORM]: VkFormat.ASTC_6X6_UNORM_BLOCK,
+        [TextureFormat.ASTC_6X6_RGBA_SRGB]: VkFormat.ASTC_6X6_SRGB_BLOCK,
+        [TextureFormat.ASTC_8X5_RGBA_UNORM]: VkFormat.ASTC_8X5_UNORM_BLOCK,
+        [TextureFormat.ASTC_8X5_RGBA_SRGB]: VkFormat.ASTC_8X5_SRGB_BLOCK,
+        [TextureFormat.ASTC_8X6_RGBA_UNORM]: VkFormat.ASTC_8X6_UNORM_BLOCK,
+        [TextureFormat.ASTC_8X6_RGBA_SRGB]: VkFormat.ASTC_8X6_SRGB_BLOCK,
+        [TextureFormat.ASTC_8X8_RGBA_UNORM]: VkFormat.ASTC_8X8_UNORM_BLOCK,
+        [TextureFormat.ASTC_8X8_RGBA_SRGB]: VkFormat.ASTC_8X8_SRGB_BLOCK,
+        [TextureFormat.ASTC_10X5_RGBA_UNORM]: VkFormat.ASTC_10X5_UNORM_BLOCK,
+        [TextureFormat.ASTC_10X5_RGBA_SRGB]: VkFormat.ASTC_10X5_SRGB_BLOCK,
+        [TextureFormat.ASTC_10X6_RGBA_UNORM]: VkFormat.ASTC_10X6_UNORM_BLOCK,
+        [TextureFormat.ASTC_10X6_RGBA_SRGB]: VkFormat.ASTC_10X6_SRGB_BLOCK,
+        [TextureFormat.ASTC_10X8_RGBA_UNORM]: VkFormat.ASTC_10X8_UNORM_BLOCK,
+        [TextureFormat.ASTC_10X8_RGBA_SRGB]: VkFormat.ASTC_10X8_SRGB_BLOCK,
+        [TextureFormat.ASTC_10X10_RGBA_UNORM]: VkFormat.ASTC_10X10_UNORM_BLOCK,
+        [TextureFormat.ASTC_10X10_RGBA_SRGB]: VkFormat.ASTC_10X10_SRGB_BLOCK,
+        [TextureFormat.ASTC_12X10_RGBA_UNORM]: VkFormat.ASTC_12X10_UNORM_BLOCK,
+        [TextureFormat.ASTC_12X10_RGBA_SRGB]: VkFormat.ASTC_12X10_SRGB_BLOCK,
+        [TextureFormat.ASTC_12X12_RGBA_UNORM]: VkFormat.ASTC_12X12_UNORM_BLOCK,
+        [TextureFormat.ASTC_12X12_RGBA_SRGB]: VkFormat.ASTC_12X12_SRGB_BLOCK,
+
+        // PVRTC
+        [TextureFormat.PVRTC_4BPPV1_RGBA]: VkFormat.PVRTC1_4BPP_UNORM_BLOCK_IMG,
+        [TextureFormat.PVRTC_4BPPV1_RGB]: VkFormat.PVRTC1_4BPP_UNORM_BLOCK_IMG,
+        [TextureFormat.PVRTC_2BPPV1_RGBA]: VkFormat.PVRTC1_2BPP_UNORM_BLOCK_IMG,
+        [TextureFormat.PVRTC_2BPPV1_RGB]: VkFormat.PVRTC1_2BPP_UNORM_BLOCK_IMG,
+
+
         [TextureFormat.ETC2_RGBA8_UNORM] : VkFormat.ETC2_R8G8B8A8_UNORM_BLOCK,
+
+        // sRGB and RGB variants
+        [TextureFormat.BC7_RGBA_SRGB]: VkFormat.BC7_SRGB_BLOCK,
+        [TextureFormat.BC3_RGBA_SRGB]: VkFormat.BC3_SRGB_BLOCK,
+        [TextureFormat.BC1_RGB_UNORM]: VkFormat.BC1_RGB_UNORM_BLOCK,
+        [TextureFormat.BC1_RGB_SRGB]: VkFormat.BC1_RGB_SRGB_BLOCK,
+        [TextureFormat.ETC2_RGBA8_SRGB]: VkFormat.ETC2_R8G8B8A8_SRGB_BLOCK,
+        [TextureFormat.ETC2_RGB8_UNORM]: VkFormat.ETC2_R8G8B8_UNORM_BLOCK,
+        [TextureFormat.ETC2_RGB8_SRGB]: VkFormat.ETC2_R8G8B8_SRGB_BLOCK,
     };
 
-    private static readonly _mapTextureFormatKtxTranscodeFormat: { [key: number]: number } = {
+    private static readonly _mapTextureFormatKtxTranscodeFormat: { [key: string]: number } = {
         [TextureFormat.RGBA_8_UNORM]: KtxTranscodeFormat.RGBA32,
-        [TextureFormat.ASTC_4X4_RGBA]: KtxTranscodeFormat.ASTC_4X4_RGBA,
+        [TextureFormat.ASTC_4X4_RGBA_UNORM]: KtxTranscodeFormat.ASTC_4X4_RGBA,
         [TextureFormat.BC3_RGBA_UNORM]: KtxTranscodeFormat.BC3_RGBA,
         [TextureFormat.BC7_RGBA_UNORM]: KtxTranscodeFormat.BC7_RGBA,
         [TextureFormat.ETC2_RGBA8_UNORM]: KtxTranscodeFormat.ETC2_RGBA,
+        [TextureFormat.PVRTC_4BPPV1_RGBA] : KtxTranscodeFormat.PVRTC1_4_RGBA,
+        // Basis transcodes to the same blocks for sRGB; only the GPU format differs.
+        [TextureFormat.RGBA_8_UNORM_SRGB]: KtxTranscodeFormat.RGBA32,
+        [TextureFormat.ASTC_4X4_RGBA_SRGB]: KtxTranscodeFormat.ASTC_4X4_RGBA,
+        [TextureFormat.BC3_RGBA_SRGB]: KtxTranscodeFormat.BC3_RGBA,
+        [TextureFormat.BC7_RGBA_SRGB]: KtxTranscodeFormat.BC7_RGBA,
+        [TextureFormat.ETC2_RGBA8_SRGB]: KtxTranscodeFormat.ETC2_RGBA,
     };
 
     private static readonly _mapKtxTranscodeFormatVkFormat: { [key: number]: number } = {
@@ -49,18 +212,70 @@ export class TextureUtilities {
         [KtxTranscodeFormat.KTX_TTF_BC5_RG]: VkFormat.BC5_UNORM_BLOCK,
         [KtxTranscodeFormat.BC7_RGBA]: VkFormat.BC7_UNORM_BLOCK,
         [KtxTranscodeFormat.KTX_TTF_PVRTC1_4_RGB]: VkFormat.PVRTC1_4BPP_UNORM_BLOCK_IMG,
-        [KtxTranscodeFormat.KTX_TTF_PVRTC1_4_RGBA]: VkFormat.PVRTC1_4BPP_UNORM_BLOCK_IMG,
+        [KtxTranscodeFormat.PVRTC1_4_RGBA]: VkFormat.PVRTC1_4BPP_UNORM_BLOCK_IMG,
         [KtxTranscodeFormat.ASTC_4X4_RGBA]: VkFormat.ASTC_4X4_UNORM_BLOCK,
         [KtxTranscodeFormat.RGBA32]: VkFormat.R8G8B8A8_UNORM,
         [KtxTranscodeFormat.KTX_TTF_RGB565]: VkFormat.R5G6B5_UNORM_PACK16,
         [KtxTranscodeFormat.KTX_TTF_BGR565]: VkFormat.B5G6R5_UNORM_PACK16,
         [KtxTranscodeFormat.KTX_TTF_RGBA4444]: VkFormat.R4G4B4A4_UNORM_PACK16,
         [KtxTranscodeFormat.KTX_TTF_PVRTC2_4_RGB]: VkFormat.PVRTC2_4BPP_UNORM_BLOCK_IMG,
-        [KtxTranscodeFormat.KTX_TTF_PVRTC2_4_RGBA]: VkFormat.PVRTC2_4BPP_UNORM_BLOCK_IMG,
+        [KtxTranscodeFormat.PVRTC2_4_RGBA]: VkFormat.PVRTC2_4BPP_UNORM_BLOCK_IMG,
         [KtxTranscodeFormat.KTX_TTF_ETC2_EAC_R11]: VkFormat.EAC_R11_UNORM_BLOCK,
         [KtxTranscodeFormat.KTX_TTF_ETC2_EAC_RG11]: VkFormat.EAC_R11G11_UNORM_BLOCK,
     };
 
+    /**
+     * Whether the format stores sRGB-encoded colour (sampled as linear by the GPU).
+     * @param format The texture format.
+     */
+    public static isSrgbFormat(format: TextureFormat): boolean {
+        return format.endsWith("_SRGB");
+    }
+
+    /**
+     * Gets the sRGB variant of a linear format, or the format itself if it has none or is already sRGB.
+     * @param format The texture format.
+     */
+    public static toSrgbFormat(format: TextureFormat): TextureFormat {
+        return this._srgbVariant[format] ?? format;
+    }
+
+    /**
+     * Gets the linear variant of an sRGB format, or the format itself.
+     * @param format The texture format.
+     */
+    public static toLinearFormat(format: TextureFormat): TextureFormat {
+        for (const linear in this._srgbVariant) {
+            if (this._srgbVariant[linear] === format) return linear as TextureFormat;
+        }
+        return format;
+    }
+
+    /**
+     * Gets the block size (width, height) of a format: 1x1 for uncompressed, 4x4 for BC/ETC2, and the ASTC block.
+     * Returns null for formats it does not know.
+     * @param format The texture format.
+     */
+    public static getBlockSize(format: TextureFormat): [number, number] | null {
+        if (!this.isCompressedTextureFormat(format)) {
+            return [1, 1];
+        }
+        const astc = /^ASTC_(\d+)X(\d+)_/.exec(format);
+        if (astc) {
+            return [Number(astc[1]), Number(astc[2])];
+        }
+        if (format.startsWith("BC") || format.startsWith("ETC2")) {
+            return [4, 4];
+        }
+        if (format.startsWith("PVRTC_2BPP")) {
+            return [8, 4];
+        }
+        if (format.startsWith("PVRTC_4BPP")) {
+            return [4, 4];
+        }
+        return null;
+    }
+
     /**
      * Checks if the given texture format is a compressed texture format.
      * @param format - The texture format to check.