From 18461fee44a7fd733b3949edba7f76bae1d882d4 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Mon, 6 Dec 2021 03:46:18 -0600
Subject: [PATCH] Fixes for Qt6

---
 src/DDS/DDSDefinitions.py | 359 ++++++++++++++++++++++++++------------
 src/DDS/DDSFile.py        | 109 +++++++-----
 src/DDS/glstuff.py        |  12 +-
 src/DDSPreview.py         | 163 +++++++++--------
 4 files changed, 403 insertions(+), 240 deletions(-)

diff --git a/src/DDS/DDSDefinitions.py b/src/DDS/DDSDefinitions.py
index 37f7b8c..a058370 100644
--- a/src/DDS/DDSDefinitions.py
+++ b/src/DDS/DDSDefinitions.py
@@ -5,12 +5,14 @@ from typing import ClassVar, List
 
 from .glstuff import GL_IMAGE_FORMAT, CompressedGLTextureFormat, UncompressedGLTextureFormat
 
-DDS_MAGIC_NUMBER = b"DDS " #b"\x20\x53\x44\x44"
+DDS_MAGIC_NUMBER = b"DDS "  # b"\x20\x53\x44\x44"
+
 
 class IntEnumFromZero(IntEnum):
     def _generate_next_value_(name, start, count, last_values):
         return count
 
+
 class D3D10_RESOURCE_DIMENSION(IntEnumFromZero):
     D3D10_RESOURCE_DIMENSION_UNKNOWN = auto()
     D3D10_RESOURCE_DIMENSION_BUFFER = auto()
@@ -18,6 +20,7 @@ class D3D10_RESOURCE_DIMENSION(IntEnumFromZero):
     D3D10_RESOURCE_DIMENSION_TEXTURE2D = auto()
     D3D10_RESOURCE_DIMENSION_TEXTURE3D = auto()
 
+
 class DXGI_FORMAT(IntEnumFromZero):
     DXGI_FORMAT_UNKNOWN = auto()
     DXGI_FORMAT_R32G32B32A32_TYPELESS = auto()
@@ -139,18 +142,18 @@ class DXGI_FORMAT(IntEnumFromZero):
     DXGI_FORMAT_V208 = auto()
     DXGI_FORMAT_V408 = auto()
     DXGI_FORMAT_FORCE_UINT = auto()
-    
+
 
 def DataclassFromBytes(dataclass):
     class LoadableDataclass(dataclass):
-        def __init__(self, bytes = None):
+        def __init__(self, bytes=None):
             super(LoadableDataclass, self).__init__()
             if bytes:
                 self.fromBytes(bytes)
-        
+
         def fromStream(self, byteStream):
             self.fromBytes(byteStream.read(struct.calcsize(self.structFormat)))
-        
+
         def fromBytes(self, bytes):
             loaded = struct.unpack(self.structFormat, bytes)
             fields = dataclasses.fields(self)
@@ -167,14 +170,15 @@ def DataclassFromBytes(dataclass):
                 else:
                     self.__dict__[field.name] = field.type(loaded[memberIndex])
                     memberIndex += 1
-    
+
     return LoadableDataclass
 
+
 @DataclassFromBytes
 @dataclasses.dataclass
 class DDS_PIXELFORMAT:
     structFormat: ClassVar[str] = "<II4sI4s4s4s4s"
-    
+
     class Flags(IntFlag):
         DDPF_ALPHAPIXELS = 0x1
         DDPF_ALPHA = 0x2
@@ -182,21 +186,22 @@ class DDS_PIXELFORMAT:
         DDPF_RGB = 0x40
         DDPF_YUV = 0x200
         DDPF_LUMINANCE = 0x20000
-    
+
     dwSize: int = 0
     dwFlags: Flags = 0
-    dwFourCC: bytes = dataclasses.field(default_factory = lambda : b"\x00\x00\x00\x00")
+    dwFourCC: bytes = dataclasses.field(default_factory=lambda: b"\x00\x00\x00\x00")
     dwRGBBitCount: int = 0
-    dwRBitMask: bytes = dataclasses.field(default_factory = lambda : b"\x00\x00\x00\x00")
-    dwGBitMask: bytes = dataclasses.field(default_factory = lambda : b"\x00\x00\x00\x00")
-    dwBBitMask: bytes = dataclasses.field(default_factory = lambda : b"\x00\x00\x00\x00")
-    dwABitMask: bytes = dataclasses.field(default_factory = lambda : b"\x00\x00\x00\x00")
+    dwRBitMask: bytes = dataclasses.field(default_factory=lambda: b"\x00\x00\x00\x00")
+    dwGBitMask: bytes = dataclasses.field(default_factory=lambda: b"\x00\x00\x00\x00")
+    dwBBitMask: bytes = dataclasses.field(default_factory=lambda: b"\x00\x00\x00\x00")
+    dwABitMask: bytes = dataclasses.field(default_factory=lambda: b"\x00\x00\x00\x00")
+
 
 @DataclassFromBytes
 @dataclasses.dataclass
 class DDS_HEADER:
     structFormat: ClassVar[str] = "<IIIIIII IIIIIIIIIII 32s IIIII"
-    
+
     class Flags(IntFlag):
         DDSD_CAPS = 0x1
         DDSD_HEIGHT = 0x2
@@ -206,12 +211,12 @@ class DDS_HEADER:
         DDSD_MIPMAPCOUNT = 0x20000
         DDSD_LINEARSIZE = 0x80000
         DDSD_DEPTH = 0x800000
-    
+
     class Caps(IntFlag):
         DDSCAPS_COMPLEX = 0x8
         DDSCAPS_MIPMAP = 0x400000
         DDSCAPS_TEXTURE = 0x1000
-    
+
     class Caps2(IntFlag):
         DDSCAPS2_CUBEMAP = 0x200
         DDSCAPS2_CUBEMAP_POSITIVEX = 0x400
@@ -221,7 +226,7 @@ class DDS_HEADER:
         DDSCAPS2_CUBEMAP_POSITIVEZ = 0x4000
         DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x8000
         DDSCAPS2_VOLUME = 0x200000
-    
+
     dwSize: int = 0
     dwFlags: Flags = 0
     dwHeight: int = 0
@@ -229,7 +234,7 @@ class DDS_HEADER:
     dwPitchOrLinearSize: int = 0
     dwDepth: int = 0
     dwMipMapCount: int = 0
-    dwReserved1: List[int] = dataclasses.field(default_factory = lambda : [0] * 11, metadata = {"count" : 11})
+    dwReserved1: List[int] = dataclasses.field(default_factory=lambda: [0] * 11, metadata={"count": 11})
     ddspf: DDS_PIXELFORMAT = DDS_PIXELFORMAT()
     dwCaps: Caps = 0
     dwCaps2: Caps2 = 0
@@ -237,21 +242,22 @@ class DDS_HEADER:
     dwCaps4: int = 0
     dwReserved2: int = 0
 
+
 @DataclassFromBytes
 @dataclasses.dataclass
 class DDS_HEADER_DXT10:
     structFormat: ClassVar[str] = "<IIIII"
-    
+
     class MiscFlag(IntFlag):
         DDS_RESOURCE_MISC_TEXTURECUBE = 0x4
-    
+
     class MiscFlags2(IntFlag):
         DDS_ALPHA_MODE_UNKNOWN = 0x0
         DDS_ALPHA_MODE_STRAIGHT = 0x1
         DDS_ALPHA_MODE_PREMULTIPLIED = 0x2
         DDS_ALPHA_MODE_OPAQUE = 0x3
         DDS_ALPHA_MODE_CUSTOM = 0x4
-    
+
     dxgiFormat: DXGI_FORMAT = 0
     resourceDimension: D3D10_RESOURCE_DIMENSION = 0
     miscFlag: MiscFlag = 0
@@ -263,6 +269,7 @@ class UnsupportedDDSFormatException(Exception):
     """Thrown when an unsupported DDS format or broken DDS file is given"""
     pass
 
+
 def fourCCToDXGI(fourCC):
     converter = {
         b"DXT1": DXGI_FORMAT.DXGI_FORMAT_BC1_UNORM,
@@ -288,107 +295,221 @@ def fourCCToDXGI(fourCC):
     if fourCC in converter:
         return converter[fourCC]
 
+
 dxgiToGL = {
     DXGI_FORMAT.DXGI_FORMAT_UNKNOWN: None,
     DXGI_FORMAT.DXGI_FORMAT_R32G32B32A32_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_R32G32B32A32_FLOAT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA32F, GL_IMAGE_FORMAT.GL_RGBA, GL_IMAGE_FORMAT.GL_FLOAT),
-    DXGI_FORMAT.DXGI_FORMAT_R32G32B32A32_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA32UI, GL_IMAGE_FORMAT.GL_RGBA_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_INT),
-    DXGI_FORMAT.DXGI_FORMAT_R32G32B32A32_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA32I, GL_IMAGE_FORMAT.GL_RGBA_INTEGER, GL_IMAGE_FORMAT.GL_INT),
+    DXGI_FORMAT.DXGI_FORMAT_R32G32B32A32_FLOAT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA32F,
+                                                                            GL_IMAGE_FORMAT.GL_RGBA,
+                                                                            GL_IMAGE_FORMAT.GL_FLOAT),
+    DXGI_FORMAT.DXGI_FORMAT_R32G32B32A32_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA32UI,
+                                                                           GL_IMAGE_FORMAT.GL_RGBA_INTEGER,
+                                                                           GL_IMAGE_FORMAT.GL_UNSIGNED_INT),
+    DXGI_FORMAT.DXGI_FORMAT_R32G32B32A32_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA32I,
+                                                                           GL_IMAGE_FORMAT.GL_RGBA_INTEGER,
+                                                                           GL_IMAGE_FORMAT.GL_INT),
     DXGI_FORMAT.DXGI_FORMAT_R32G32B32_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_R32G32B32_FLOAT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB32F, GL_IMAGE_FORMAT.GL_RGB, GL_IMAGE_FORMAT.GL_FLOAT),
-    DXGI_FORMAT.DXGI_FORMAT_R32G32B32_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB32UI, GL_IMAGE_FORMAT.GL_RGB_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_INT),
-    DXGI_FORMAT.DXGI_FORMAT_R32G32B32_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB32I, GL_IMAGE_FORMAT.GL_RGB_INTEGER, GL_IMAGE_FORMAT.GL_INT),
+    DXGI_FORMAT.DXGI_FORMAT_R32G32B32_FLOAT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB32F,
+                                                                         GL_IMAGE_FORMAT.GL_RGB,
+                                                                         GL_IMAGE_FORMAT.GL_FLOAT),
+    DXGI_FORMAT.DXGI_FORMAT_R32G32B32_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB32UI,
+                                                                        GL_IMAGE_FORMAT.GL_RGB_INTEGER,
+                                                                        GL_IMAGE_FORMAT.GL_UNSIGNED_INT),
+    DXGI_FORMAT.DXGI_FORMAT_R32G32B32_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB32I,
+                                                                        GL_IMAGE_FORMAT.GL_RGB_INTEGER,
+                                                                        GL_IMAGE_FORMAT.GL_INT),
     DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_FLOAT: UncompressedGLTextureFormat(((3,0), [b"GL_ARB_half_float_pixel"]), GL_IMAGE_FORMAT.GL_RGBA16F, GL_IMAGE_FORMAT.GL_RGBA, GL_IMAGE_FORMAT.GL_HALF_FLOAT),
-    DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA16, GL_IMAGE_FORMAT.GL_RGBA, GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
-    DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA16UI, GL_IMAGE_FORMAT.GL_RGBA_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
-    DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA16_SNORM, GL_IMAGE_FORMAT.GL_RGBA, GL_IMAGE_FORMAT.GL_SHORT),
-    DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA16I, GL_IMAGE_FORMAT.GL_RGBA_INTEGER, GL_IMAGE_FORMAT.GL_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_FLOAT: UncompressedGLTextureFormat(((3, 0), [b"GL_ARB_half_float_pixel"]),
+                                                                            GL_IMAGE_FORMAT.GL_RGBA16F,
+                                                                            GL_IMAGE_FORMAT.GL_RGBA,
+                                                                            GL_IMAGE_FORMAT.GL_HALF_FLOAT),
+    DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA16,
+                                                                            GL_IMAGE_FORMAT.GL_RGBA,
+                                                                            GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA16UI,
+                                                                           GL_IMAGE_FORMAT.GL_RGBA_INTEGER,
+                                                                           GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA16_SNORM,
+                                                                            GL_IMAGE_FORMAT.GL_RGBA,
+                                                                            GL_IMAGE_FORMAT.GL_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16G16B16A16_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA16I,
+                                                                           GL_IMAGE_FORMAT.GL_RGBA_INTEGER,
+                                                                           GL_IMAGE_FORMAT.GL_SHORT),
     DXGI_FORMAT.DXGI_FORMAT_R32G32_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_R32G32_FLOAT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG32F, GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_FLOAT),
-    DXGI_FORMAT.DXGI_FORMAT_R32G32_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG32UI, GL_IMAGE_FORMAT.GL_RG_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_INT),
-    DXGI_FORMAT.DXGI_FORMAT_R32G32_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG32I, GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_INT),
+    DXGI_FORMAT.DXGI_FORMAT_R32G32_FLOAT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG32F,
+                                                                      GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_FLOAT),
+    DXGI_FORMAT.DXGI_FORMAT_R32G32_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG32UI,
+                                                                     GL_IMAGE_FORMAT.GL_RG_INTEGER,
+                                                                     GL_IMAGE_FORMAT.GL_UNSIGNED_INT),
+    DXGI_FORMAT.DXGI_FORMAT_R32G32_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG32I,
+                                                                     GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_INT),
     DXGI_FORMAT.DXGI_FORMAT_R32G8X24_TYPELESS: None,
     DXGI_FORMAT.DXGI_FORMAT_D32_FLOAT_S8X24_UINT: None,
-    DXGI_FORMAT.DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R32F, GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_FLOAT),
+    DXGI_FORMAT.DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R32F,
+                                                                                  GL_IMAGE_FORMAT.GL_RG,
+                                                                                  GL_IMAGE_FORMAT.GL_FLOAT),
     DXGI_FORMAT.DXGI_FORMAT_X32_TYPELESS_G8X24_UINT: None,
     DXGI_FORMAT.DXGI_FORMAT_R10G10B10A2_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_R10G10B10A2_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB10_A2, GL_IMAGE_FORMAT.GL_RGBA, GL_IMAGE_FORMAT.GL_UNSIGNED_INT_2_10_10_10_REV),
-    DXGI_FORMAT.DXGI_FORMAT_R10G10B10A2_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB10_A2UI, GL_IMAGE_FORMAT.GL_RGBA_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_INT_2_10_10_10_REV),
-    DXGI_FORMAT.DXGI_FORMAT_R11G11B10_FLOAT: UncompressedGLTextureFormat(((-1,0), [b"EXT_packed_float"]), GL_IMAGE_FORMAT.GL_R11F_G11F_B10F, GL_IMAGE_FORMAT.GL_RGB, GL_IMAGE_FORMAT.GL_UNSIGNED_INT_10F_11F_11F_REV_EXT),
+    DXGI_FORMAT.DXGI_FORMAT_R10G10B10A2_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB10_A2,
+                                                                           GL_IMAGE_FORMAT.GL_RGBA,
+                                                                           GL_IMAGE_FORMAT.GL_UNSIGNED_INT_2_10_10_10_REV),
+    DXGI_FORMAT.DXGI_FORMAT_R10G10B10A2_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB10_A2UI,
+                                                                          GL_IMAGE_FORMAT.GL_RGBA_INTEGER,
+                                                                          GL_IMAGE_FORMAT.GL_UNSIGNED_INT_2_10_10_10_REV),
+    DXGI_FORMAT.DXGI_FORMAT_R11G11B10_FLOAT: UncompressedGLTextureFormat(((-1, 0), [b"EXT_packed_float"]),
+                                                                         GL_IMAGE_FORMAT.GL_R11F_G11F_B10F,
+                                                                         GL_IMAGE_FORMAT.GL_RGB,
+                                                                         GL_IMAGE_FORMAT.GL_UNSIGNED_INT_10F_11F_11F_REV_EXT),
     DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA8, GL_IMAGE_FORMAT.GL_RGBA, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: UncompressedGLTextureFormat(((2,1), [b"GL_EXT_texture_sRGB"]), GL_IMAGE_FORMAT.GL_SRGB8_ALPHA8, GL_IMAGE_FORMAT.GL_RGBA, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA8UI, GL_IMAGE_FORMAT.GL_RGBA_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA8_SNORM, GL_IMAGE_FORMAT.GL_RGBA, GL_IMAGE_FORMAT.GL_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA8I, GL_IMAGE_FORMAT.GL_RGBA_INTEGER, GL_IMAGE_FORMAT.GL_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA8,
+                                                                        GL_IMAGE_FORMAT.GL_RGBA,
+                                                                        GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: UncompressedGLTextureFormat(((2, 1), [b"GL_EXT_texture_sRGB"]),
+                                                                             GL_IMAGE_FORMAT.GL_SRGB8_ALPHA8,
+                                                                             GL_IMAGE_FORMAT.GL_RGBA,
+                                                                             GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA8UI,
+                                                                       GL_IMAGE_FORMAT.GL_RGBA_INTEGER,
+                                                                       GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA8_SNORM,
+                                                                        GL_IMAGE_FORMAT.GL_RGBA,
+                                                                        GL_IMAGE_FORMAT.GL_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA8I,
+                                                                       GL_IMAGE_FORMAT.GL_RGBA_INTEGER,
+                                                                       GL_IMAGE_FORMAT.GL_BYTE),
     DXGI_FORMAT.DXGI_FORMAT_R16G16_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_R16G16_FLOAT: UncompressedGLTextureFormat(((3,0), [b"GL_ARB_half_float_pixel"]), GL_IMAGE_FORMAT.GL_RG16F, GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_HALF_FLOAT),
-    DXGI_FORMAT.DXGI_FORMAT_R16G16_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG16, GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
-    DXGI_FORMAT.DXGI_FORMAT_R16G16_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG16UI, GL_IMAGE_FORMAT.GL_RG_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
-    DXGI_FORMAT.DXGI_FORMAT_R16G16_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG16_SNORM, GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_SHORT),
-    DXGI_FORMAT.DXGI_FORMAT_R16G16_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG16I, GL_IMAGE_FORMAT.GL_RG_INTEGER, GL_IMAGE_FORMAT.GL_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16G16_FLOAT: UncompressedGLTextureFormat(((3, 0), [b"GL_ARB_half_float_pixel"]),
+                                                                      GL_IMAGE_FORMAT.GL_RG16F, GL_IMAGE_FORMAT.GL_RG,
+                                                                      GL_IMAGE_FORMAT.GL_HALF_FLOAT),
+    DXGI_FORMAT.DXGI_FORMAT_R16G16_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG16,
+                                                                      GL_IMAGE_FORMAT.GL_RG,
+                                                                      GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16G16_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG16UI,
+                                                                     GL_IMAGE_FORMAT.GL_RG_INTEGER,
+                                                                     GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16G16_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG16_SNORM,
+                                                                      GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16G16_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG16I,
+                                                                     GL_IMAGE_FORMAT.GL_RG_INTEGER,
+                                                                     GL_IMAGE_FORMAT.GL_SHORT),
     DXGI_FORMAT.DXGI_FORMAT_R32_TYPELESS: None,
     DXGI_FORMAT.DXGI_FORMAT_D32_FLOAT: None,
-    DXGI_FORMAT.DXGI_FORMAT_R32_FLOAT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R32F, GL_IMAGE_FORMAT.GL_RED, GL_IMAGE_FORMAT.GL_FLOAT),
-    DXGI_FORMAT.DXGI_FORMAT_R32_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R32UI, GL_IMAGE_FORMAT.GL_RED_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_INT),
-    DXGI_FORMAT.DXGI_FORMAT_R32_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R32I, GL_IMAGE_FORMAT.GL_RED_INTEGER, GL_IMAGE_FORMAT.GL_INT),
+    DXGI_FORMAT.DXGI_FORMAT_R32_FLOAT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R32F,
+                                                                   GL_IMAGE_FORMAT.GL_RED, GL_IMAGE_FORMAT.GL_FLOAT),
+    DXGI_FORMAT.DXGI_FORMAT_R32_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R32UI,
+                                                                  GL_IMAGE_FORMAT.GL_RED_INTEGER,
+                                                                  GL_IMAGE_FORMAT.GL_UNSIGNED_INT),
+    DXGI_FORMAT.DXGI_FORMAT_R32_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R32I,
+                                                                  GL_IMAGE_FORMAT.GL_RED_INTEGER,
+                                                                  GL_IMAGE_FORMAT.GL_INT),
     DXGI_FORMAT.DXGI_FORMAT_R24G8_TYPELESS: None,
     DXGI_FORMAT.DXGI_FORMAT_D24_UNORM_S8_UINT: None,
     DXGI_FORMAT.DXGI_FORMAT_R24_UNORM_X8_TYPELESS: None,
     DXGI_FORMAT.DXGI_FORMAT_X24_TYPELESS_G8_UINT: None,
     DXGI_FORMAT.DXGI_FORMAT_R8G8_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_R8G8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG8, GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_R8G8_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG8UI, GL_IMAGE_FORMAT.GL_RG_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_R8G8_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG8_SNORM, GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_R8G8_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG8I, GL_IMAGE_FORMAT.GL_RG_INTEGER, GL_IMAGE_FORMAT.GL_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8G8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG8, GL_IMAGE_FORMAT.GL_RG,
+                                                                    GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8G8_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG8UI,
+                                                                   GL_IMAGE_FORMAT.GL_RG_INTEGER,
+                                                                   GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8G8_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG8_SNORM,
+                                                                    GL_IMAGE_FORMAT.GL_RG, GL_IMAGE_FORMAT.GL_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8G8_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RG8I,
+                                                                   GL_IMAGE_FORMAT.GL_RG_INTEGER,
+                                                                   GL_IMAGE_FORMAT.GL_BYTE),
     DXGI_FORMAT.DXGI_FORMAT_R16_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_R16_FLOAT: UncompressedGLTextureFormat(((3,0), [b"GL_ARB_half_float_pixel"]), GL_IMAGE_FORMAT.GL_R16F, GL_IMAGE_FORMAT.GL_RED, GL_IMAGE_FORMAT.GL_HALF_FLOAT),
+    DXGI_FORMAT.DXGI_FORMAT_R16_FLOAT: UncompressedGLTextureFormat(((3, 0), [b"GL_ARB_half_float_pixel"]),
+                                                                   GL_IMAGE_FORMAT.GL_R16F, GL_IMAGE_FORMAT.GL_RED,
+                                                                   GL_IMAGE_FORMAT.GL_HALF_FLOAT),
     DXGI_FORMAT.DXGI_FORMAT_D16_UNORM: None,
-    DXGI_FORMAT.DXGI_FORMAT_R16_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R16, GL_IMAGE_FORMAT.GL_RED, GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
-    DXGI_FORMAT.DXGI_FORMAT_R16_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R16UI, GL_IMAGE_FORMAT.GL_RED_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
-    DXGI_FORMAT.DXGI_FORMAT_R16_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R16_SNORM, GL_IMAGE_FORMAT.GL_RED, GL_IMAGE_FORMAT.GL_SHORT),
-    DXGI_FORMAT.DXGI_FORMAT_R16_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R16I, GL_IMAGE_FORMAT.GL_RED_INTEGER, GL_IMAGE_FORMAT.GL_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R16, GL_IMAGE_FORMAT.GL_RED,
+                                                                   GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R16UI,
+                                                                  GL_IMAGE_FORMAT.GL_RED_INTEGER,
+                                                                  GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R16_SNORM,
+                                                                   GL_IMAGE_FORMAT.GL_RED, GL_IMAGE_FORMAT.GL_SHORT),
+    DXGI_FORMAT.DXGI_FORMAT_R16_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R16I,
+                                                                  GL_IMAGE_FORMAT.GL_RED_INTEGER,
+                                                                  GL_IMAGE_FORMAT.GL_SHORT),
     DXGI_FORMAT.DXGI_FORMAT_R8_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_R8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R8, GL_IMAGE_FORMAT.GL_RED, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_R8_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R8UI, GL_IMAGE_FORMAT.GL_RED_INTEGER, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_R8_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R8_SNORM, GL_IMAGE_FORMAT.GL_RED, GL_IMAGE_FORMAT.GL_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_R8_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R8I, GL_IMAGE_FORMAT.GL_RED_INTEGER, GL_IMAGE_FORMAT.GL_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_A8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_ALPHA8, GL_IMAGE_FORMAT.GL_ALPHA, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R8, GL_IMAGE_FORMAT.GL_RED,
+                                                                  GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8_UINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R8UI,
+                                                                 GL_IMAGE_FORMAT.GL_RED_INTEGER,
+                                                                 GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8_SNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R8_SNORM,
+                                                                  GL_IMAGE_FORMAT.GL_RED, GL_IMAGE_FORMAT.GL_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_R8_SINT: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_R8I,
+                                                                 GL_IMAGE_FORMAT.GL_RED_INTEGER,
+                                                                 GL_IMAGE_FORMAT.GL_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_A8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_ALPHA8,
+                                                                  GL_IMAGE_FORMAT.GL_ALPHA,
+                                                                  GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
     DXGI_FORMAT.DXGI_FORMAT_R1_UNORM: None,
-    DXGI_FORMAT.DXGI_FORMAT_R9G9B9E5_SHAREDEXP: UncompressedGLTextureFormat(((3,0), [b"GL_EXT_texture_shared_exponent"]), GL_IMAGE_FORMAT.GL_RGB9_E5, GL_IMAGE_FORMAT.GL_RGB, GL_IMAGE_FORMAT.GL_UNSIGNED_INT_5_9_9_9_REV_EXT),
+    DXGI_FORMAT.DXGI_FORMAT_R9G9B9E5_SHAREDEXP: UncompressedGLTextureFormat(
+        ((3, 0), [b"GL_EXT_texture_shared_exponent"]), GL_IMAGE_FORMAT.GL_RGB9_E5, GL_IMAGE_FORMAT.GL_RGB,
+        GL_IMAGE_FORMAT.GL_UNSIGNED_INT_5_9_9_9_REV_EXT),
     DXGI_FORMAT.DXGI_FORMAT_R8G8_B8G8_UNORM: None,
     DXGI_FORMAT.DXGI_FORMAT_G8R8_G8B8_UNORM: None,
     DXGI_FORMAT.DXGI_FORMAT_BC1_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_BC1_UNORM: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT),
-    DXGI_FORMAT.DXGI_FORMAT_BC1_UNORM_SRGB: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT),
+    DXGI_FORMAT.DXGI_FORMAT_BC1_UNORM: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]),
+                                                                 GL_IMAGE_FORMAT.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT),
+    DXGI_FORMAT.DXGI_FORMAT_BC1_UNORM_SRGB: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]),
+                                                                      GL_IMAGE_FORMAT.GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT),
     DXGI_FORMAT.DXGI_FORMAT_BC2_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_BC2_UNORM: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT),
-    DXGI_FORMAT.DXGI_FORMAT_BC2_UNORM_SRGB: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT),
+    DXGI_FORMAT.DXGI_FORMAT_BC2_UNORM: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]),
+                                                                 GL_IMAGE_FORMAT.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT),
+    DXGI_FORMAT.DXGI_FORMAT_BC2_UNORM_SRGB: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]),
+                                                                      GL_IMAGE_FORMAT.GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT),
     DXGI_FORMAT.DXGI_FORMAT_BC3_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_BC3_UNORM: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT),
-    DXGI_FORMAT.DXGI_FORMAT_BC3_UNORM_SRGB: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT),
+    DXGI_FORMAT.DXGI_FORMAT_BC3_UNORM: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]),
+                                                                 GL_IMAGE_FORMAT.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT),
+    DXGI_FORMAT.DXGI_FORMAT_BC3_UNORM_SRGB: CompressedGLTextureFormat(((-1, 0), [b"GL_EXT_texture_compression_s3tc"]),
+                                                                      GL_IMAGE_FORMAT.GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT),
     DXGI_FORMAT.DXGI_FORMAT_BC4_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_BC4_UNORM: CompressedGLTextureFormat(((3, 0), [b"GL_ARB_texture_compression_rgtc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_RED_RGTC1),
-    DXGI_FORMAT.DXGI_FORMAT_BC4_SNORM: CompressedGLTextureFormat(((3, 0), [b"GL_ARB_texture_compression_rgtc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_SIGNED_RED_RGTC1),
+    DXGI_FORMAT.DXGI_FORMAT_BC4_UNORM: CompressedGLTextureFormat(((3, 0), [b"GL_ARB_texture_compression_rgtc"]),
+                                                                 GL_IMAGE_FORMAT.GL_COMPRESSED_RED_RGTC1),
+    DXGI_FORMAT.DXGI_FORMAT_BC4_SNORM: CompressedGLTextureFormat(((3, 0), [b"GL_ARB_texture_compression_rgtc"]),
+                                                                 GL_IMAGE_FORMAT.GL_COMPRESSED_SIGNED_RED_RGTC1),
     DXGI_FORMAT.DXGI_FORMAT_BC5_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_BC5_UNORM: CompressedGLTextureFormat(((3, 0), [b"GL_ARB_texture_compression_rgtc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_RG_RGTC2),
-    DXGI_FORMAT.DXGI_FORMAT_BC5_SNORM: CompressedGLTextureFormat(((3, 0), [b"GL_ARB_texture_compression_rgtc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_SIGNED_RG_RGTC2),
-    DXGI_FORMAT.DXGI_FORMAT_B5G6R5_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB, GL_IMAGE_FORMAT.GL_RGB, GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT_5_6_5_REV),
-    DXGI_FORMAT.DXGI_FORMAT_B5G5R5A1_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB5_A1, GL_IMAGE_FORMAT.GL_BGRA, GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT_1_5_5_5_REV),
-    DXGI_FORMAT.DXGI_FORMAT_B8G8R8A8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA8, GL_IMAGE_FORMAT.GL_BGRA, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
-    DXGI_FORMAT.DXGI_FORMAT_B8G8R8X8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB8, GL_IMAGE_FORMAT.GL_BGRA, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_BC5_UNORM: CompressedGLTextureFormat(((3, 0), [b"GL_ARB_texture_compression_rgtc"]),
+                                                                 GL_IMAGE_FORMAT.GL_COMPRESSED_RG_RGTC2),
+    DXGI_FORMAT.DXGI_FORMAT_BC5_SNORM: CompressedGLTextureFormat(((3, 0), [b"GL_ARB_texture_compression_rgtc"]),
+                                                                 GL_IMAGE_FORMAT.GL_COMPRESSED_SIGNED_RG_RGTC2),
+    DXGI_FORMAT.DXGI_FORMAT_B5G6R5_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB,
+                                                                      GL_IMAGE_FORMAT.GL_RGB,
+                                                                      GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT_5_6_5_REV),
+    DXGI_FORMAT.DXGI_FORMAT_B5G5R5A1_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB5_A1,
+                                                                        GL_IMAGE_FORMAT.GL_BGRA,
+                                                                        GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT_1_5_5_5_REV),
+    DXGI_FORMAT.DXGI_FORMAT_B8G8R8A8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA8,
+                                                                        GL_IMAGE_FORMAT.GL_BGRA,
+                                                                        GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_B8G8R8X8_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGB8,
+                                                                        GL_IMAGE_FORMAT.GL_BGRA,
+                                                                        GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
     DXGI_FORMAT.DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM: None,
     DXGI_FORMAT.DXGI_FORMAT_B8G8R8A8_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: UncompressedGLTextureFormat(((2,1), [b"GL_EXT_texture_sRGB"]), GL_IMAGE_FORMAT.GL_SRGB8_ALPHA8, GL_IMAGE_FORMAT.GL_BGRA, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: UncompressedGLTextureFormat(((2, 1), [b"GL_EXT_texture_sRGB"]),
+                                                                             GL_IMAGE_FORMAT.GL_SRGB8_ALPHA8,
+                                                                             GL_IMAGE_FORMAT.GL_BGRA,
+                                                                             GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
     DXGI_FORMAT.DXGI_FORMAT_B8G8R8X8_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: UncompressedGLTextureFormat(((2,1), [b"GL_EXT_texture_sRGB"]), GL_IMAGE_FORMAT.GL_SRGB8, GL_IMAGE_FORMAT.GL_BGRA, GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
+    DXGI_FORMAT.DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: UncompressedGLTextureFormat(((2, 1), [b"GL_EXT_texture_sRGB"]),
+                                                                             GL_IMAGE_FORMAT.GL_SRGB8,
+                                                                             GL_IMAGE_FORMAT.GL_BGRA,
+                                                                             GL_IMAGE_FORMAT.GL_UNSIGNED_BYTE),
     DXGI_FORMAT.DXGI_FORMAT_BC6H_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_BC6H_UF16: CompressedGLTextureFormat(((4, 2), [b"GL_ARB_texture_compression_bptc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT),
-    DXGI_FORMAT.DXGI_FORMAT_BC6H_SF16: CompressedGLTextureFormat(((4, 2), [b"GL_ARB_texture_compression_bptc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT),
+    DXGI_FORMAT.DXGI_FORMAT_BC6H_UF16: CompressedGLTextureFormat(((4, 2), [b"GL_ARB_texture_compression_bptc"]),
+                                                                 GL_IMAGE_FORMAT.GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT),
+    DXGI_FORMAT.DXGI_FORMAT_BC6H_SF16: CompressedGLTextureFormat(((4, 2), [b"GL_ARB_texture_compression_bptc"]),
+                                                                 GL_IMAGE_FORMAT.GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT),
     DXGI_FORMAT.DXGI_FORMAT_BC7_TYPELESS: None,
-    DXGI_FORMAT.DXGI_FORMAT_BC7_UNORM: CompressedGLTextureFormat(((4, 2), [b"GL_ARB_texture_compression_bptc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_RGBA_BPTC_UNORM),
-    DXGI_FORMAT.DXGI_FORMAT_BC7_UNORM_SRGB: CompressedGLTextureFormat(((4, 2), [b"GL_ARB_texture_compression_bptc"]), GL_IMAGE_FORMAT.GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM),
+    DXGI_FORMAT.DXGI_FORMAT_BC7_UNORM: CompressedGLTextureFormat(((4, 2), [b"GL_ARB_texture_compression_bptc"]),
+                                                                 GL_IMAGE_FORMAT.GL_COMPRESSED_RGBA_BPTC_UNORM),
+    DXGI_FORMAT.DXGI_FORMAT_BC7_UNORM_SRGB: CompressedGLTextureFormat(((4, 2), [b"GL_ARB_texture_compression_bptc"]),
+                                                                      GL_IMAGE_FORMAT.GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM),
     DXGI_FORMAT.DXGI_FORMAT_AYUV: None,
     DXGI_FORMAT.DXGI_FORMAT_Y410: None,
     DXGI_FORMAT.DXGI_FORMAT_Y416: None,
@@ -404,14 +525,17 @@ dxgiToGL = {
     DXGI_FORMAT.DXGI_FORMAT_IA44: None,
     DXGI_FORMAT.DXGI_FORMAT_P8: None,
     DXGI_FORMAT.DXGI_FORMAT_A8P8: None,
-    DXGI_FORMAT.DXGI_FORMAT_B4G4R4A4_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA4, GL_IMAGE_FORMAT.GL_BGRA, GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT_4_4_4_4_REV),
+    DXGI_FORMAT.DXGI_FORMAT_B4G4R4A4_UNORM: UncompressedGLTextureFormat(None, GL_IMAGE_FORMAT.GL_RGBA4,
+                                                                        GL_IMAGE_FORMAT.GL_BGRA,
+                                                                        GL_IMAGE_FORMAT.GL_UNSIGNED_SHORT_4_4_4_4_REV),
     DXGI_FORMAT.DXGI_FORMAT_P208: None,
     DXGI_FORMAT.DXGI_FORMAT_V208: None,
     DXGI_FORMAT.DXGI_FORMAT_V408: None,
     DXGI_FORMAT.DXGI_FORMAT_FORCE_UINT: None
 }
 
-def buildConverter(byteCount, usedBitCounts = {8}, bitmasks = None, intmasks = None):
+
+def buildConverter(byteCount, usedBitCounts={8}, bitmasks=None, intmasks=None):
     # A converter converts the data to boring BGRA with enough bits per channel to fit the original
     glFormat = GL_IMAGE_FORMAT.GL_BGRA
     biggestComponent = max(usedBitCounts)
@@ -430,7 +554,7 @@ def buildConverter(byteCount, usedBitCounts = {8}, bitmasks = None, intmasks = N
         glType = GL_IMAGE_FORMAT.GL_UNSIGNED_INT
         glInternalFormat = GL_IMAGE_FORMAT.GL_RGBA32F
     multiplier = 255 ** biggestComponent
-    
+
     if byteCount == 1:
         unpackFormat = "B"
         unpackCombiner = lambda x: x
@@ -439,13 +563,14 @@ def buildConverter(byteCount, usedBitCounts = {8}, bitmasks = None, intmasks = N
         unpackCombiner = lambda x: x
     elif byteCount == 3:
         unpackFormat = "3s"
+
         def unpackCombiner(x):
             x = struct.unpack("<HB", x)
             return x[0] + (x[1] << 16)
     elif byteCount == 4:
         unpackFormat = "I"
         unpackCombiner = lambda x: x
-    
+
     if intmasks:
         rIntMask, gIntMask, bIntMask, aIntMask = intmasks
     else:
@@ -453,7 +578,7 @@ def buildConverter(byteCount, usedBitCounts = {8}, bitmasks = None, intmasks = N
         gIntMask = 0
         bIntMask = 0
         aIntMask = 0
-    
+
     if bitmasks:
         if "r" in bitmasks:
             rIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["r"][:byteCount]))
@@ -467,17 +592,17 @@ def buildConverter(byteCount, usedBitCounts = {8}, bitmasks = None, intmasks = N
             rIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["luminance"][:byteCount]))
             gIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["luminance"][:byteCount]))
             bIntMask = unpackCombiner(*struct.unpack("<" + unpackFormat, bitmasks["luminance"][:byteCount]))
-    
+
     rDivisor = 2 ** bin(rIntMask).count("1") - 1
     gDivisor = 2 ** bin(gIntMask).count("1") - 1
     bDivisor = 2 ** bin(bIntMask).count("1") - 1
     aDivisor = 2 ** bin(aIntMask).count("1") - 1
-    
+
     rShift = (rIntMask & -rIntMask).bit_length() - 1
     gShift = (gIntMask & -gIntMask).bit_length() - 1
     bShift = (bIntMask & -bIntMask).bit_length() - 1
     aShift = (aIntMask & -aIntMask).bit_length() - 1
-    
+
     def convert(imageData):
         length = len(imageData) // byteCount
         unpackString = "<" + ((str(length) + unpackFormat) if unpackFormat.isalpha() else unpackFormat * length)
@@ -505,10 +630,11 @@ def buildConverter(byteCount, usedBitCounts = {8}, bitmasks = None, intmasks = N
             struct.pack_into(packFormat, repacked, repackIndex, blue, green, red, alpha)
             repackIndex += biggestComponent * 4
         return bytes(repacked)
-    
+
     return (convert, glInternalFormat, glFormat, glType)
 
-def getGLFormat(pixelFormat, dxt10Header = None):
+
+def getGLFormat(pixelFormat, dxt10Header=None):
     # Half or more of this function may be unreachable or otherwise redundant.
     glInternalFormat = None
     dxgiFormat = None
@@ -520,12 +646,13 @@ def getGLFormat(pixelFormat, dxt10Header = None):
         if fourCC == b"DX10" and not dxt10Header:
             raise UnsupportedDDSFormatException()
         dxgiFormat = dxt10Header.dxgiFormat if dxt10Header else fourCCToDXGI(fourCC)
-    
+
     if dxgiFormat:
         return dxgiToGL[dxgiFormat]
-    elif flags & (pixelFormat.Flags.DDPF_ALPHA | pixelFormat.Flags.DDPF_RGB | pixelFormat.Flags.DDPF_YUV | pixelFormat.Flags.DDPF_LUMINANCE):
+    elif flags & (
+        pixelFormat.Flags.DDPF_ALPHA | pixelFormat.Flags.DDPF_RGB | pixelFormat.Flags.DDPF_YUV | pixelFormat.Flags.DDPF_LUMINANCE):
         compressed = False
-        
+
         rBitmask = None
         gBitmask = None
         bBitmask = None
@@ -539,20 +666,20 @@ def getGLFormat(pixelFormat, dxt10Header = None):
             bBitmask = pixelFormat.dwBBitMask
         if flags & pixelFormat.Flags.DDPF_LUMINANCE:
             lumBitmask = pixelFormat.dwRBitMask
-        
+
         def bitCount(theBytes):
             count = 0
             for byte in theBytes:
                 count += bin(byte).count("1")
             return count
-        
+
         def firstBit(theBytes):
             index = 0
             for byte in theBytes:
                 if byte != 0:
                     return index + format(byte, 'b').find("1")
                 index += 8
-        
+
         bitCounts = dict()
         starts = dict()
         namedBitmasks = dict()
@@ -576,15 +703,15 @@ def getGLFormat(pixelFormat, dxt10Header = None):
             bitCounts["luminance"] = bitCount(lumBitmask)
             starts["luminance"] = firstBit(lumBitmask)
             namedBitmasks["luminance"] = lumBitmask
-        
+
         toSort = []
         for key in starts:
             toSort.append((starts[key], key))
         toSort.sort()
-        
+
         glInternalFormatName = ["GL"]
         glRequirements = None
-        
+
         desc = "GL_"
         lastBitCount = -1
         usedBitCounts = set()
@@ -597,10 +724,10 @@ def getGLFormat(pixelFormat, dxt10Header = None):
             desc += channel
         if len(usedBitCounts) != 1:
             desc += str(lastBitCount)
-        
+
         desc = desc.upper()
         glFormat = GL_IMAGE_FORMAT[desc] if desc in GL_IMAGE_FORMAT.__members__ else None
-        
+
         numComponents = len(toSort)
         byteCount = (pixelFormat.dwRGBBitCount + 7) // 8
         needsConversion = False
@@ -618,21 +745,23 @@ def getGLFormat(pixelFormat, dxt10Header = None):
                     needsConversion = True
         if not glFormat or numComponents * lastBitCount != pixelFormat.dwRGBBitCount:
             needsConversion = True
-        
+
         if needsConversion:
-            convert, glInternalFormat, glFormat, glType = buildConverter(byteCount, bitmasks = namedBitmasks)
+            convert, glInternalFormat, glFormat, glType = buildConverter(byteCount, bitmasks=namedBitmasks)
         else:
             convert = None
-    
+
     if not glInternalFormat:
         glInternalFormatName = "_".join(glInternalFormatName)
-        glInternalFormat = GL_IMAGE_FORMAT[glInternalFormatName] if glInternalFormatName in GL_IMAGE_FORMAT.__members__ else GL_IMAGE_FORMAT.GL_RGBA
-    
+        glInternalFormat = GL_IMAGE_FORMAT[
+            glInternalFormatName] if glInternalFormatName in GL_IMAGE_FORMAT.__members__ else GL_IMAGE_FORMAT.GL_RGBA
+
     if compressed:
         return CompressedGLTextureFormat(glRequirements, glInternalFormat)
     else:
         return UncompressedGLTextureFormat(glRequirements, glInternalFormat, glFormat, glType, convert)
 
+
 def sizeFromFormat(dxgiFormat, width, height):
     blockCompressed = False
     if dxgiFormat in {DXGI_FORMAT.DXGI_FORMAT_BC1_TYPELESS,
@@ -660,10 +789,10 @@ def sizeFromFormat(dxgiFormat, width, height):
                         DXGI_FORMAT.DXGI_FORMAT_BC7_UNORM_SRGB}:
         blockCompressed = True
         blockSize = 16
-    
+
     if blockCompressed:
         return max(1, ((width + 3) // 4)) * max(1, ((height + 3) // 4)) * blockSize
-    
+
     if dxgiFormat <= DXGI_FORMAT.DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
         name = dxgiFormat.name + "_"
         count = 0
diff --git a/src/DDS/DDSFile.py b/src/DDS/DDSFile.py
index 71d7f8f..43410a7 100644
--- a/src/DDS/DDSFile.py
+++ b/src/DDS/DDSFile.py
@@ -1,39 +1,44 @@
 from pathlib import Path
 
-from PyQt5.QtCore import QCoreApplication, qCritical
-from PyQt5.QtGui import QOpenGLTexture
+from PyQt6.QtCore import QCoreApplication, qCritical
+from PyQt6.QtOpenGL import QOpenGLTexture
 
 from . import DDSDefinitions
+from .glstuff import GLTextureFormat
+
 
 class DDSReadException(Exception):
     """Thrown if there was an error reading a DDS file"""
     pass
 
-ddsCubemapFaces = { DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_POSITIVEX: QOpenGLTexture.CubeMapPositiveX,
-                    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_NEGATIVEX: QOpenGLTexture.CubeMapNegativeX,
-                    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_POSITIVEY: QOpenGLTexture.CubeMapPositiveY,
-                    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_NEGATIVEY: QOpenGLTexture.CubeMapNegativeY,
-                    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_POSITIVEZ: QOpenGLTexture.CubeMapPositiveZ,
-                    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_NEGATIVEZ: QOpenGLTexture.CubeMapNegativeZ }
+
+ddsCubemapFaces = {
+    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_POSITIVEX: QOpenGLTexture.CubeMapFace.CubeMapPositiveX,
+    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_NEGATIVEX: QOpenGLTexture.CubeMapFace.CubeMapNegativeX,
+    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_POSITIVEY: QOpenGLTexture.CubeMapFace.CubeMapPositiveY,
+    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_NEGATIVEY: QOpenGLTexture.CubeMapFace.CubeMapNegativeY,
+    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_POSITIVEZ: QOpenGLTexture.CubeMapFace.CubeMapPositiveZ,
+    DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP_NEGATIVEZ: QOpenGLTexture.CubeMapFace.CubeMapNegativeZ}
+
 
 class DDSFile:
     def __init__(self, fileName):
         self.fileName = fileName
         self.header = DDSDefinitions.DDS_HEADER()
         self.dxt10Header = None
-        self.glFormat = None
+        self.glFormat: GLTextureFormat = None
         self.data = None
         self.isCubemap = None
-        
+
     def load(self):
         with Path(self.fileName).open('rb') as file:
             magicNumber = file.read(4)
             if magicNumber != DDSDefinitions.DDS_MAGIC_NUMBER:
                 qCritical(self.__tr("Magic number mismatch."))
                 raise DDSReadException()
-            
+
             self.header.fromStream(file)
-            
+
             if self.header.ddspf.dwFlags & DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_FOURCC:
                 fourCC = self.header.ddspf.dwFourCC
                 if fourCC == b"DX10":
@@ -41,12 +46,12 @@ class DDSFile:
                     self.dxt10Header.fromStream(file)
             else:
                 fourCC = None
-            
+
             self.glFormat = DDSDefinitions.getGLFormat(self.header.ddspf, self.dxt10Header)
             self.data = []
             # Do this once per layer/mip level whatever, (times one per scanline if uncompressed). Also, potentially recompute this based on the format and size in case writers lie.
-            #self.data.append(file.read(self.header.dwPitchOrLinearSize))
-            
+            # self.data.append(file.read(self.header.dwPitchOrLinearSize))
+
             layerCount = 1
             if self.header.dwCaps2 & DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP:
                 self.isCubemap = True
@@ -56,13 +61,14 @@ class DDSFile:
                         layerCount += 1
             else:
                 self.isCubemap = False
-            
+
             for layer in range(layerCount):
                 nextWidth = self.header.dwWidth
                 nextHeight = self.header.dwHeight
                 mipCount = self.mipLevels()
                 for level in range(mipCount):
-                    if self.header.ddspf.dwFlags & (DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_ALPHA | DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_RGB | DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_YUV | DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_LUMINANCE):
+                    if self.header.ddspf.dwFlags & (
+                        DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_ALPHA | DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_RGB | DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_YUV | DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_LUMINANCE):
                         size = nextWidth * nextHeight * ((self.header.ddspf.dwRGBBitCount + 7) // 8)
                     elif fourCC:
                         if self.dxt10Header:
@@ -73,7 +79,7 @@ class DDSFile:
                     self.data.append(file.read(size))
                     nextWidth = max(nextWidth // 2, 1)
                     nextHeight = max(nextHeight // 2, 1)
-                
+
     def getDescription(self):
         format = ""
         # DX10 header says the format enum
@@ -82,39 +88,45 @@ class DDSFile:
         # Pixel Format says the FourCC
         elif self.header.ddspf.dwFlags & DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_FOURCC:
             fourCC = self.header.ddspf.dwFourCC
-            format = self.__tr("{0} (equivalent to {1})").format(fourCC.decode('ascii'), DDSDefinitions.fourCCToDXGI(fourCC).name.replace("DXGI_FORMAT_", ""))
+            format = self.__tr("{0} (equivalent to {1})").format(fourCC.decode('ascii'),
+                                                                 DDSDefinitions.fourCCToDXGI(fourCC).name.replace(
+                                                                     "DXGI_FORMAT_", ""))
         # We've got bitmasks for the colour channels
         else:
             # This could be prettier if there was logic to detect that certain common bitmasks represented things more easily represented, like RGBA8
-            if self.header.ddspf.dwFlags & (DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_RGB | DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_YUV):
-                format += self.__tr("Red bitmask {0}, Green bitmask {1}, Blue bitmask {2}").format(self.header.ddspf.dwRBitMask.hex().upper(), self.header.ddspf.dwGBitMask.hex().upper(), self.header.ddspf.dwBBitMask.hex().upper())
+            if self.header.ddspf.dwFlags & (
+                DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_RGB | DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_YUV):
+                format += self.__tr("Red bitmask {0}, Green bitmask {1}, Blue bitmask {2}").format(
+                    self.header.ddspf.dwRBitMask.hex().upper(), self.header.ddspf.dwGBitMask.hex().upper(),
+                    self.header.ddspf.dwBBitMask.hex().upper())
             if self.header.ddspf.dwFlags & DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_LUMINANCE:
                 if format != "":
                     format += ", "
                 format += self.__tr("Luminance bitmask {0}").format(self.header.ddspf.dwRBitMask.hex().upper())
-            if self.header.ddspf.dwFlags & (DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_ALPHA | DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_ALPHAPIXELS):
+            if self.header.ddspf.dwFlags & (
+                DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_ALPHA | DDSDefinitions.DDS_PIXELFORMAT.Flags.DDPF_ALPHAPIXELS):
                 if format != "":
                     format += ", "
                 format += self.__tr("Alpha bitmask {0}").format(self.header.ddspf.dwABitMask.hex().upper())
-        
+
         size = self.__tr("{0}×{1}").format(self.header.dwWidth, self.header.dwHeight)
-        
+
         dimensions = self.__tr("Cubemap") if self.isCubemap else self.__tr("2D")
-        
+
         mipmaps = self.__tr("Mipmapped") if self.mipLevels() != 1 else self.__tr("No mipmaps")
-        
+
         return self.__tr("{0}, {1} {2}, {3}").format(format, size, dimensions, mipmaps)
-    
+
     def mipLevels(self):
         if self.header.dwFlags & DDSDefinitions.DDS_HEADER.Flags.DDSD_MIPMAPCOUNT:
             return self.header.dwMipMapCount
         else:
             return 1
-    
+
     def asQOpenGLTexture(self, gl, context):
         if not self.data:
             return
-        
+
         if self.glFormat.requirements:
             minVersion, extensions = self.glFormat.requirements
             glVersion = (gl.glGetIntegerv(gl.GL_MAJOR_VERSION), gl.glGetIntegerv(gl.GL_MINOR_VERSION))
@@ -127,15 +139,15 @@ class DDSFile:
                 if not compatible:
                     qCritical(self.__tr("OpenGL driver incompatible with texture format."))
                     return None
-        
+
         if self.header.dwCaps2 & DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP:
-            texture = QOpenGLTexture(QOpenGLTexture.TargetCubeMap)
+            texture = QOpenGLTexture(QOpenGLTexture.Target.TargetCubeMap)
             if self.header.dwWidth != self.header.dwHeight:
                 qCritical(self.__tr("Cubemap faces must be square"))
                 return None
         else:
             # Assume GL_TEXTURE_2D for now
-            texture = QOpenGLTexture(QOpenGLTexture.Target2D)
+            texture = QOpenGLTexture(QOpenGLTexture.Target.Target2D)
         # Assume single layer for now
         # self.texture.setLayers(1)
         mipCount = self.mipLevels()
@@ -143,9 +155,9 @@ class DDSFile:
         texture.setMipLevels(mipCount)
         texture.setMipLevelRange(0, mipCount - 1)
         texture.setSize(self.header.dwWidth, self.header.dwHeight)
-        texture.setFormat(self.glFormat.internalFormat)
+        texture.setFormat(QOpenGLTexture.TextureFormat(self.glFormat.internalFormat))
         texture.allocateStorage()
-        
+
         if self.header.dwCaps2 & DDSDefinitions.DDS_HEADER.Caps2.DDSCAPS2_CUBEMAP:
             # Lisa hasn't whipped David Wang into shape yet. At least there are fewer bugs than under Raja.
             # The specific bug has been reported and AMD "will try to reproduce it soon"
@@ -158,11 +170,19 @@ class DDSFile:
                     for i in range(mipCount):
                         if self.glFormat.compressed:
                             if not noDSA:
-                                texture.setCompressedData(i, 0, ddsCubemapFaces[face], len(self.data[faceIndex * mipCount + i]), self.data[faceIndex * mipCount + i])
+                                texture.setCompressedData(i, 0, ddsCubemapFaces[face],
+                                                          len(self.data[faceIndex * mipCount + i]),
+                                                          self.data[faceIndex * mipCount + i])
                             else:
-                                gl.glCompressedTexSubImage2D(ddsCubemapFaces[face], i, 0, 0, max(self.header.dwWidth // 2 ** i, 1), max(self.header.dwHeight // 2 ** i, 1), self.glFormat.internalFormat, len(self.data[faceIndex * mipCount + i]), self.data[faceIndex * mipCount + i])
+                                gl.glCompressedTexSubImage2D(ddsCubemapFaces[face], i, 0, 0,
+                                                             max(self.header.dwWidth // 2 ** i, 1),
+                                                             max(self.header.dwHeight // 2 ** i, 1),
+                                                             self.glFormat.internalFormat,
+                                                             len(self.data[faceIndex * mipCount + i]),
+                                                             self.data[faceIndex * mipCount + i])
                         else:
-                            texture.setData(i, 0, ddsCubemapFaces[face], self.glFormat.format, self.glFormat.type, self.glFormat.converter(self.data[faceIndex * mipCount + i]))
+                            texture.setData(i, 0, ddsCubemapFaces[face], self.glFormat.format, self.glFormat.type,
+                                            self.glFormat.converter(self.data[faceIndex * mipCount + i]))
                     faceIndex += 1
             if noDSA:
                 texture.release()
@@ -171,15 +191,16 @@ class DDSFile:
                 if self.glFormat.compressed:
                     texture.setCompressedData(i, 0, len(self.data[i]), self.data[i])
                 else:
-                    texture.setData(i, 0, self.glFormat.format, self.glFormat.type, self.glFormat.converter(self.data[i]))
-        
-        texture.setWrapMode(QOpenGLTexture.ClampToEdge)
-        
+                    texture.setData(i, 0, self.glFormat.format, self.glFormat.type,
+                                    self.glFormat.converter(self.data[i]))
+
+        texture.setWrapMode(QOpenGLTexture.WrapMode.ClampToEdge)
+
         if self.glFormat.samplerType != "F":
             # integer textures can't be filtered
-            texture.setMinMagFilters(QOpenGLTexture.NearestMipMapNearest, QOpenGLTexture.Nearest)
-        
+            texture.setMinMagFilters(QOpenGLTexture.Filter.NearestMipMapNearest, QOpenGLTexture.Filter.Nearest)
+
         return texture
-    
+
     def __tr(self, str):
         return QCoreApplication.translate("DDSFile", str)
\ No newline at end of file
diff --git a/src/DDS/glstuff.py b/src/DDS/glstuff.py
index ea17fa0..097b7e5 100644
--- a/src/DDS/glstuff.py
+++ b/src/DDS/glstuff.py
@@ -1,5 +1,6 @@
 from enum import IntEnum
 
+
 class GL_IMAGE_FORMAT(IntEnum):
     GL_BYTE = 0x1400
     GL_UNSIGNED_BYTE = 0x1401
@@ -111,9 +112,9 @@ class GL_IMAGE_FORMAT(IntEnum):
     GL_RGBA16F = 0x881A
     GL_RGB16F = 0x881B
     GL_R11F_G11F_B10F = 0x8C3A
-    GL_UNSIGNED_INT_10F_11F_11F_REV_EXT = 0x8C3B # EXT_packed_float
+    GL_UNSIGNED_INT_10F_11F_11F_REV_EXT = 0x8C3B  # EXT_packed_float
     GL_RGB9_E5 = 0x8C3D
-    GL_UNSIGNED_INT_5_9_9_9_REV_EXT = 0x8C3E # EXT_texture_shared_exponent
+    GL_UNSIGNED_INT_5_9_9_9_REV_EXT = 0x8C3E  # EXT_texture_shared_exponent
     GL_SRGB = 0x8C40
     GL_SRGB8 = 0x8C41
     GL_SRGB_ALPHA = 0x8C42
@@ -173,12 +174,13 @@ class GL_IMAGE_FORMAT(IntEnum):
     GL_COMPRESSED_RGBA8_ETC2_EAC = 0x9278
     GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC = 0x9279
 
+
 class GLTextureFormat:
     def __init__(self, requirements, internalFormat, compressed):
         self.requirements = requirements
         self.internalFormat = internalFormat
         self.compressed = compressed
-        
+
         if internalFormat.name.endswith("UI"):
             self.samplerType = "UI"
         elif internalFormat.name.endswith("I"):
@@ -186,12 +188,14 @@ class GLTextureFormat:
         else:
             self.samplerType = "F"
 
+
 class CompressedGLTextureFormat(GLTextureFormat):
     def __init__(self, requirements, internalFormat):
         super().__init__(requirements, internalFormat, True)
 
+
 class UncompressedGLTextureFormat(GLTextureFormat):
-    def __init__(self, requirements, internalFormat, format, type, converter = None):
+    def __init__(self, requirements, internalFormat, format, type, converter=None):
         super().__init__(requirements, internalFormat, False)
         self.format = format
         self.type = type
diff --git a/src/DDSPreview.py b/src/DDSPreview.py
index 96e8398..fa7d558 100644
--- a/src/DDSPreview.py
+++ b/src/DDSPreview.py
@@ -2,9 +2,12 @@ import struct
 import sys
 import threading
 
-from PyQt5.QtCore import QCoreApplication, qDebug, Qt
-from PyQt5.QtGui import QColor, QOpenGLBuffer, QOpenGLContext, QOpenGLDebugLogger, QOpenGLShader, QOpenGLShaderProgram, QOpenGLTexture, QOpenGLVersionProfile, QOpenGLVertexArrayObject, QSurfaceFormat
-from PyQt5.QtWidgets import QCheckBox, QDialog, QGridLayout, QLabel, QOpenGLWidget, QPushButton, QWidget
+from PyQt6.QtCore import QCoreApplication, qDebug, Qt
+from PyQt6.QtGui import QColor, QOpenGLContext, QSurfaceFormat, QWindow
+from PyQt6.QtOpenGLWidgets import QOpenGLWidget
+from PyQt6.QtWidgets import QCheckBox, QDialog, QGridLayout, QLabel, QPushButton, QWidget, QColorDialog
+from PyQt6.QtOpenGL import QOpenGLBuffer, QOpenGLDebugLogger, QOpenGLShader, QOpenGLShaderProgram, QOpenGLTexture, \
+    QOpenGLVersionProfile, QOpenGLVertexArrayObject, QOpenGLFunctions_4_1_Core, QOpenGLVersionFunctionsFactory
 
 from DDS.DDSFile import DDSFile
 
@@ -136,61 +139,61 @@ void main()
 
 vertices = [
     # vertex coordinates        texture coordinates
-    -1.0, -1.0, 0.5, 1.0,       0.0, 1.0,
-    -1.0,  1.0, 0.5, 1.0,       0.0, 0.0,
-     1.0,  1.0, 0.5, 1.0,       1.0, 0.0,
-    
-    -1.0, -1.0, 0.5, 1.0,       0.0, 1.0,
-     1.0,  1.0, 0.5, 1.0,       1.0, 0.0,
-     1.0, -1.0, 0.5, 1.0,       1.0, 1.0,
+    -1.0, -1.0, 0.5, 1.0, 0.0, 1.0,
+    -1.0, 1.0, 0.5, 1.0, 0.0, 0.0,
+    1.0, 1.0, 0.5, 1.0, 1.0, 0.0,
+
+    -1.0, -1.0, 0.5, 1.0, 0.0, 1.0,
+    1.0, 1.0, 0.5, 1.0, 1.0, 0.0,
+    1.0, -1.0, 0.5, 1.0, 1.0, 1.0,
 ]
 
-
-
 glVersionProfile = QOpenGLVersionProfile()
 glVersionProfile.setVersion(2, 1)
 
+
 class DDSWidget(QOpenGLWidget):
-    def __init__(self, ddsFile, debugContext = False, parent = None, f = Qt.WindowFlags()):
-        super(DDSWidget, self).__init__(parent, f)
-        
+    def __init__(self, ddsFile, debugContext=False, parent=None, flags=Qt.WindowType(0)):
+        super(DDSWidget, self).__init__(parent, flags=flags)
+
         self.ddsFile = ddsFile
-        
+
         self.clean = True
-        
+
         self.logger = None
-        
+
         self.program = None
         self.transparecyProgram = None
         self.texture = None
         self.vbo = None
         self.vao = None
-        
+
         self.backgroundColour = None
-        
+
         if debugContext:
             format = QSurfaceFormat()
-            format.setOption(QSurfaceFormat.DebugContext)
+            format.setOption(QSurfaceFormat.FormatOption.DebugContext)
             self.setFormat(format)
             self.logger = QOpenGLDebugLogger(self)
-    
+
     def __del__(self):
         self.cleanup()
-    
+
     def __dtor__(self):
         self.cleanup()
-    
+
     def initializeGL(self):
         if self.logger:
             self.logger.initialize()
-            self.logger.messageLogged.connect(lambda message: qDebug(self.__tr("OpenGL debug message: {0}").fomat(message.message())))
+            self.logger.messageLogged.connect(
+                lambda message: qDebug(self.__tr("OpenGL debug message: {0}").fomat(message.message())))
             self.logger.startLogging()
-        
-        gl = QOpenGLContext.currentContext().versionFunctions(glVersionProfile)
+
+        gl = QOpenGLVersionFunctionsFactory.get(glVersionProfile)
         QOpenGLContext.currentContext().aboutToBeDestroyed.connect(self.cleanup)
-        
+
         self.clean = False
-        
+
         fragmentShader = None
         vertexShader = vertexShader2D
         if self.ddsFile.isCubemap:
@@ -205,79 +208,79 @@ class DDSWidget(QOpenGLWidget):
             fragmentShader = fragmentShaderUInt
         else:
             fragmentShader = fragmentShaderSInt
-        
+
         self.program = QOpenGLShaderProgram(self)
-        self.program.addShaderFromSourceCode(QOpenGLShader.Vertex, vertexShader)
-        self.program.addShaderFromSourceCode(QOpenGLShader.Fragment, fragmentShader)
+        self.program.addShaderFromSourceCode(QOpenGLShader.ShaderTypeBit.Vertex, vertexShader)
+        self.program.addShaderFromSourceCode(QOpenGLShader.ShaderTypeBit.Fragment, fragmentShader)
         self.program.bindAttributeLocation("position", 0)
         self.program.bindAttributeLocation("texCoordIn", 1)
         self.program.link()
-        
+
         self.transparecyProgram = QOpenGLShaderProgram(self)
-        self.transparecyProgram.addShaderFromSourceCode(QOpenGLShader.Vertex, transparencyVS)
-        self.transparecyProgram.addShaderFromSourceCode(QOpenGLShader.Fragment, transparencyFS)
+        self.transparecyProgram.addShaderFromSourceCode(QOpenGLShader.ShaderTypeBit.Vertex, transparencyVS)
+        self.transparecyProgram.addShaderFromSourceCode(QOpenGLShader.ShaderTypeBit.Fragment, transparencyFS)
         self.transparecyProgram.bindAttributeLocation("position", 0)
         self.transparecyProgram.link()
-        
+
         self.vao = QOpenGLVertexArrayObject(self)
         vaoBinder = QOpenGLVertexArrayObject.Binder(self.vao)
-        
-        self.vbo = QOpenGLBuffer(QOpenGLBuffer.VertexBuffer)
+
+        self.vbo = QOpenGLBuffer(QOpenGLBuffer.Type.VertexBuffer)
         self.vbo.create()
         self.vbo.bind()
-        
+
         theBytes = struct.pack("%sf" % len(vertices), *vertices)
         self.vbo.allocate(theBytes, len(theBytes))
-        
+
         gl.glEnableVertexAttribArray(0)
         gl.glEnableVertexAttribArray(1)
         gl.glVertexAttribPointer(0, 4, gl.GL_FLOAT, False, 6 * 4, 0)
         gl.glVertexAttribPointer(1, 2, gl.GL_FLOAT, False, 6 * 4, 4 * 4)
-        
+
         self.texture = self.ddsFile.asQOpenGLTexture(gl, QOpenGLContext.currentContext())
-    
+
     def resizeGL(self, w, h):
         aspectRatioTex = self.texture.width() / self.texture.height() if self.texture else 1.0
         aspectRatioWidget = w / h
         ratioRatio = aspectRatioTex / aspectRatioWidget
-        
+
         self.program.bind()
         self.program.setUniformValue("aspectRatioRatio", ratioRatio)
         self.program.release()
-    
+
     def paintGL(self):
-        gl = QOpenGLContext.currentContext().versionFunctions(glVersionProfile)
-        
+        gl = QOpenGLVersionFunctionsFactory.get(glVersionProfile)
+
         vaoBinder = QOpenGLVertexArrayObject.Binder(self.vao)
-        
+
         # Draw checkerboard so transparency is obvious
         self.transparecyProgram.bind()
-        
+
         if self.backgroundColour and self.backgroundColour.isValid():
             self.transparecyProgram.setUniformValue("backgroundColour", self.backgroundColour)
-        
+
         gl.glDrawArrays(gl.GL_TRIANGLES, 0, 6)
-        
+
         self.transparecyProgram.release()
-        
+
         self.program.bind()
-            
+
         if self.texture:
             self.texture.bind()
-        
+
         gl.glEnable(gl.GL_BLEND)
         gl.glBlendFunc(gl.GL_SRC_ALPHA, gl.GL_ONE_MINUS_SRC_ALPHA)
-        
+
         gl.glDrawArrays(gl.GL_TRIANGLES, 0, 6)
-        
+
         if self.texture:
             self.texture.release()
         self.program.release()
-    
+
     def cleanup(self):
         if not self.clean:
             self.makeCurrent()
-            
+
             self.program = None
             self.transparecyProgram = None
             if self.texture:
@@ -287,22 +290,22 @@ class DDSWidget(QOpenGLWidget):
             self.vbo = None
             self.vao.destroy()
             self.vao = None
-            
+
             self.doneCurrent()
             self.clean = True
-    
+
     def setBackgroundColour(self, colour):
         self.backgroundColour = colour
-    
+
     def getBackgroundColour(self):
         return self.backgroundColour
-    
+
     def __tr(self, str):
         return QCoreApplication.translate("DDSWidget", str)
 
 
 class DDSPreview(mobase.IPluginPreview):
-    
+
     def __init__(self):
         super().__init__()
         self.__organizer = None
@@ -324,15 +327,16 @@ class DDSPreview(mobase.IPluginPreview):
         return mobase.VersionInfo(1, 0, 0, 0)
 
     def settings(self):
-        return [mobase.PluginSetting("log gl errors", self.__tr("If enabled, log OpenGL errors and debug messages. May decrease performance."), False),
+        return [mobase.PluginSetting("log gl errors", self.__tr(
+            "If enabled, log OpenGL errors and debug messages. May decrease performance."), False),
                 mobase.PluginSetting("background r", self.__tr("Red channel of background colour"), 0),
                 mobase.PluginSetting("background g", self.__tr("Green channel of background colour"), 0),
                 mobase.PluginSetting("background b", self.__tr("Blue channel of background colour"), 0),
                 mobase.PluginSetting("background a", self.__tr("Alpha channel of background colour"), 0)]
-    
+
     def supportedExtensions(self):
         return ["dds"]
-    
+
     def genFilePreview(self, fileName, maxSize):
         ddsFile = DDSFile(fileName)
         ddsFile.load()
@@ -342,41 +346,46 @@ class DDSPreview(mobase.IPluginPreview):
         # Label grows before button
         layout.setColumnStretch(0, 1)
         layout.addWidget(self.__makeLabel(ddsFile), 1, 0, 1, 1)
-        
+
         ddsWidget = DDSWidget(ddsFile, self.__organizer.pluginSetting(self.name(), "log gl errors"))
         layout.addWidget(ddsWidget, 0, 0, 1, 2)
-        
+
         layout.addWidget(self.__makeColourButton(ddsWidget), 1, 1, 1, 1)
-        
+
         widget = QWidget()
         widget.setLayout(layout)
         return widget
-    
+
     def __tr(self, str):
         return QCoreApplication.translate("DDSPreview", str)
-    
+
     def __makeLabel(self, ddsFile):
         label = QLabel(ddsFile.getDescription())
         label.setWordWrap(True)
-        label.setTextInteractionFlags(Qt.TextSelectableByMouse)
+        label.setTextInteractionFlags(Qt.TextInteractionFlag.TextSelectableByMouse)
         return label
-    
+
     def __makeColourButton(self, ddsWidget):
         button = QPushButton(self.__tr("Pick background colour"))
-        savedColour = QColor(self.__organizer.pluginSetting(self.name(), "background r"), self.__organizer.pluginSetting(self.name(), "background g"), self.__organizer.pluginSetting(self.name(), "background b"), self.__organizer.pluginSetting(self.name(), "background a"))
+        savedColour = QColor(self.__organizer.pluginSetting(self.name(), "background r"),
+                             self.__organizer.pluginSetting(self.name(), "background g"),
+                             self.__organizer.pluginSetting(self.name(), "background b"),
+                             self.__organizer.pluginSetting(self.name(), "background a"))
         ddsWidget.setBackgroundColour(savedColour)
-        
+
         def pickColour(unused):
-            newColour = QColorDialog.getColor(ddsWidget.getBackgroundColour(), button, "Background colour", QColorDialog.ShowAlphaChannel)
+            newColour = QColorDialog.getColor(ddsWidget.getBackgroundColour(), button, "Background colour",
+                                              QColorDialog.ColorDialogOption.ShowAlphaChannel)
             if newColour.isValid():
                 ddsWidget.setBackgroundColour(newColour)
                 self.__organizer.setPluginSetting(self.name(), "background r", newColour.red())
                 self.__organizer.setPluginSetting(self.name(), "background g", newColour.green())
                 self.__organizer.setPluginSetting(self.name(), "background b", newColour.blue())
                 self.__organizer.setPluginSetting(self.name(), "background a", newColour.alpha())
-        
+
         button.clicked.connect(pickColour)
         return button
-    
+
+
 def createPlugin():
     return DDSPreview()
\ No newline at end of file