working on python bindings

fixing strings management
adding python bindings base
2026-06-13 11:24:28 +02:00 · 2025-10-22 08:25:00 +02:00 · 2025-10-16 10:36:31 +02:00 · 2025-10-15 22:32:21 +02:00
50 changed files with 147700 additions and 190581 deletions
@@ -7,6 +7,5 @@ version: 2
 updates:
  - package-ecosystem: "github-actions" # See documentation for possible values
    directory: "/" # Location of package manifests
-    target-branch: "indev"
    schedule:
      interval: "weekly"
@@ -1,7 +1,6 @@
 name: Fetch Dependencies

 on:
-  workflow_dispatch:
  schedule:
    - cron: '0 0 * * 0' # Runs weekly

@@ -17,18 +16,14 @@ jobs:
      run: cd scripts && bash ./fetch_dependencies.sh

    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7
+      uses: peter-evans/create-pull-request@v6
      with:
-        token: ${{ secrets.REPO_SCOPED_TOKEN }}
-        delete-branch: true
        title: update dependencies
        commit-message: "[BOT] update dependencies"
-        committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
-        author: kbJeff-8 <kbJeff-8@users.noreply.github.com>
+        committer: GitHub <noreply@github.com>
+        author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
        signoff: false
        base: indev
-        assignees: Kbz-8
-        reviewers: Kbz-8
        branch: auto_deps_updates
        labels: |
          automated
@@ -9,7 +9,7 @@ jobs:
      issues: write
      pull-requests: write
    steps:
-    - uses: actions/first-interaction@v2
+    - uses: actions/first-interaction@v1
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        issue-message: |
@@ -1,8 +1,6 @@
 name: Linux (clang)

 on:
-  repository_dispatch:
-    types: [create-pull-request]
  pull_request:
  push:
    paths-ignore:
@@ -1,8 +1,6 @@
 name: Linux (gcc)

 on:
-  repository_dispatch:
-    types: [create-pull-request]
  pull_request:
  push:
    paths-ignore:
@@ -1,8 +1,6 @@
 name: macOS

 on:
-  repository_dispatch:
-    types: [create-pull-request]
  pull_request:
  push:
    paths-ignore:
@@ -1,8 +1,6 @@
 name: Unit tests

 on:
-  repository_dispatch:
-    types: [create-pull-request]
  pull_request:
  push:
    paths-ignore:
@@ -25,7 +23,7 @@ jobs:
    - name: Checkout repository
      uses: actions/checkout@v4

-    - uses: NcStudios/VulkanCI@v1.2
+    - uses: NcStudios/VulkanCI@v1.0

    - name: Install system dependencies
      run: |
@@ -1,8 +1,6 @@
 name: Windows (xmake)

 on:
-  repository_dispatch:
-    types: [create-pull-request]
  pull_request:
  push:
    paths-ignore:
@@ -23,3 +23,5 @@
 objs/
 build/
 example/Test
+macrolibpy/__pycache__
+example/__pycache__
@@ -4,6 +4,7 @@ MAKE = make --no-print-directory
 OS ?= $(shell uname -s)
 DEBUG ?= false
 TOOLCHAIN ?= clang
+IMAGES_OPTIMIZED ?= true
 FORCE_INTEGRATED_GPU ?= false
 GRAPHICS_MEMORY_DUMP ?= false
 PROFILER ?= false
@@ -37,9 +38,6 @@ GCH = runtime/Includes/PreCompiled.h.gch
 CCH = runtime/Includes/PreCompiled.h.pch
 PCH =

-# Personal path, should be overriden with env var
-UNIT_TESTS_PATH = ../UnitTester/build/Bin/linux_x86_64/MacroUnitTest
-
 NZSLC ?= nzslc

 ifeq ($(TOOLCHAIN), gcc)
@@ -68,6 +66,10 @@ ifeq ($(FORCE_INTEGRATED_GPU), true)
 	_ENABLEDFLAGS += FORCE_INTEGRATED_GPU
 endif

+ifeq ($(IMAGES_OPTIMIZED), true)
+	_ENABLEDFLAGS += IMAGE_OPTIMIZED
+endif
+
 ifeq ($(GRAPHICS_MEMORY_DUMP), true)
 	_ENABLEDFLAGS += GRAPHICS_MEMORY_DUMP
 endif
@@ -159,9 +161,6 @@ clean-shaders:

 shaders: clean-shaders $(SPVS)

-tests: debug
-	@$(UNIT_TESTS_PATH) --headless --path="./$(NAME)"
-
 clean:
 	@$(RM) $(OBJ_DIR)
 	@printf "Cleaned $(_BOLD)$(OBJ_DIR)$(_RESET)\n"
@@ -103,6 +103,9 @@ MacroLibX has a strong safety support, mainly by checking every pointer that you
 ### 🛠️ Set the toolchain
 If you want to use `GCC` to build the mlx you can use `make TOOLCHAIN=gcc`

+### ⚠️⚠️⚠️ 🖼️ Image optimisations ⚠️⚠️⚠️
+If you run into glitches when writing or reading pixels from images you can turn off images optimisations by using `make IMAGES_OPTIMIZED=false`.
+
 ### 🖥️ Force the integrated GPU (not recommended)
 You can force the mlx to use your integrated GPU by using `make FORCE_INTEGRATED_GPU=true`. Note that there are a lot of chances that your application crashes by using that.

@@ -16,6 +16,9 @@ MacroLibX has a strong safety support, mainly by checking every pointer that you
 ### 🛠️ Set the toolchain
 To change the compilation toolchain you can use `xmake config --toolchain=[gcc|clang|...]`

+### ⚠️⚠️⚠️ 🖼️ Image optimisations ⚠️⚠️⚠️
+If you run into glitches when writing or reading pixels from images you can turn off images optimisations by using `xmake config --images_optimized=n`.
+
 ### 🖥️ Force the integrated GPU (not recommended)
 You can force the mlx to use your integrated GPU using `xmake config --force_integrated_gpu=y`. Note that there are a lot of chances that your application crashes by using that.

@@ -23,7 +26,7 @@ You can force the mlx to use your integrated GPU using `xmake config --force_int
 The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `xmake config --graphics_memory_dump=y`.

 ### 🪛 A possible build configuration
-As a configuration example here's how the command can look like `xmake config --mode=debug --toolchain=clang --graphics_memory_dump=y`
+As a configuration example here's how the command can look like `xmake config --mode=debug --toolchain=clang --graphics_memory_dump=y --images_optimized=n`

 ## 🚧 Build the lib

@@ -7,5 +7,6 @@
 -DMLX_BUILD
 -DSDL_MAIN_HANDLED
 -DDEBUG
+-DIMAGE_OPTIMIZED
 -D_REENTRANT
 -isystem/usr/include/SDL2
@@ -0,0 +1,85 @@
+import macrolibpy as mlpy
+import pathlib
+import os
+import math
+
+current_path = pathlib.Path(__file__).parent.resolve()
+
+mlx = mlpy.Context.create()
+win = mlx.new_window(400, 400, "My window")
+mlx.set_fps_goal(60)
+logo_png = mlx.new_image_from_file(os.path.join(current_path, "42_logo.png"))[0]
+logo_bmp = mlx.new_image_from_file(os.path.join(current_path, "42_logo.bmp"))[0]
+logo_jpg = mlx.new_image_from_file(os.path.join(current_path, "42_logo.jpg"))[0]
+
+win.pixel_put(200, 10, 0xFF0FFFF)
+win.put_image(logo_png, 0, 0)
+
+mlx.set_font_scale(os.path.join(current_path, "font.ttf"), 16.0)
+win.string_put(20, 20, 0x0020FFFF, "that text will disappear")
+
+custom_img = mlx.new_image(100, 100)
+i, j, k = 0, 0, 0
+while i < (100 * 100) * 4:
+    if j >= 100:
+        j = 0
+        k += 1
+    if i < 10000 or i > 20000:
+        custom_img.set_pixel(j, k, (k << 24) | (j << 16) | (i << 8) | 0x99)
+    i += 4
+    j += 1
+
+def onevent(ev):
+    if ev == 0:
+        mlx.loop_end()
+
+THRESHOLD = 200
+CIRCLE_RADIUS = 50
+CIRCLE_DIAMETER = CIRCLE_RADIUS + CIRCLE_RADIUS
+def onupdate():
+    if onupdate.i > THRESHOLD:
+        win.clear(0x334D4DFF)
+        win.put_transformed_image(logo_bmp, 220, 40, 0.5, 0.5, onupdate.i)
+
+    if onupdate.i >= THRESHOLD + THRESHOLD / 4:
+        mlx.set_font_scale("default", 16.0)
+    else:
+        mlx.set_font_scale("default", 6.0)
+
+    win.string_put(160, 120, 0xFF2066FF, "this text should be behind")
+    win.put_image(logo_png, 100, 100)
+    win.put_image(custom_img, 150, 60)
+
+    mlx.set_font("default")
+    win.string_put(20, 50, 0xFFFFFFFF, "that's a text")
+
+    color = 0
+    for j in range(0, 400):
+        win.pixel_put(j, j, 0x0000FFFF + (color << 24))
+        win.pixel_put(399 - j, j, 0x0000FFFF)
+        color += (color < 255)
+
+    if onupdate.i < THRESHOLD:
+        win.put_transformed_image(logo_jpg, 210, 150, 0.5, 2.0, 0.0)
+    else:
+        win.put_transformed_image(logo_jpg, 210, 150, abs(math.sin(onupdate.i / 100.0)), abs(math.cos(onupdate.i / 100.0) * 2.0), 0.0)
+
+    mlx.set_font_scale("default", 8.0)
+    win.string_put(210, 175, 0xFFAF2BFF, "hidden")
+
+    win.pixel_put_region(200, 170, CIRCLE_DIAMETER, CIRCLE_DIAMETER, onupdate.pixels_circle)
+
+    onupdate.i += 1
+onupdate.i = 0
+onupdate.pixels_circle = [pixel for pixel in range(0, CIRCLE_DIAMETER * CIRCLE_DIAMETER)]
+
+i = 0
+for j in range(0, CIRCLE_DIAMETER):
+    for k in range(0, CIRCLE_DIAMETER):
+        if((CIRCLE_RADIUS - j) * (CIRCLE_RADIUS - j) + (CIRCLE_RADIUS - k) * (CIRCLE_RADIUS - k) < CIRCLE_RADIUS * CIRCLE_RADIUS):
+            onupdate.pixels_circle[i] = 0xA10000FF + ((j * k * i) << 8)
+        i += 1
+
+win.on_event(mlpy.EventType.WINDOW_EVENT, onevent)
+mlx.add_loop_hook(onupdate)
+mlx.loop()
@@ -6,7 +6,7 @@
 /*   By: maldavid <contact@kbz8.me>                 +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/10/04 16:56:35 by maldavid          #+#    #+#             */
-/*   Updated: 2025/10/22 16:59:21 by maldavid         ###   ########.fr       */
+/*   Updated: 2025/03/12 22:26:32 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

@@ -361,6 +361,14 @@ MLX_API void mlx_destroy_image(mlx_context mlx, mlx_image image);
 * @param y          Y coordinate in the image
 *
 * @return (int)     Return the pixel data
+ *
+ * /!\ If you run into glitches when writing or reading pixels from images /!\
+ * You need to add IMAGES_OPTIMIZED=false to your make mlx command
+ * ```
+ *     ~ git clone https://github.com/seekrs/MacroLibX.git
+ *     ~ cd MacroLibX
+ *     ~ make IMAGES_OPTIMIZED=false
+ * ```
 */
 MLX_API mlx_color mlx_get_image_pixel(mlx_context mlx, mlx_image image, int x, int y);

@@ -372,6 +380,14 @@ MLX_API mlx_color mlx_get_image_pixel(mlx_context mlx, mlx_image image, int x, i
 * @param x          X coordinate in the image
 * @param y          Y coordinate in the image
 * @param color      Color of the pixel to set
+ *
+ * /!\ If you run into glitches when writing or reading pixels from images /!\
+ * You need to add IMAGES_OPTIMIZED=false to your make mlx command
+ * ```
+ *     ~ git clone https://github.com/seekrs/MacroLibX.git
+ *     ~ cd MacroLibX
+ *     ~ make IMAGES_OPTIMIZED=false
+ * ```
 */
 MLX_API void mlx_set_image_pixel(mlx_context mlx, mlx_image image, int x, int y, mlx_color color);

@@ -6,7 +6,7 @@
 /*   By: maldavid <contact@kbz8.me>                 +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/12/14 16:17:10 by maldavid          #+#    #+#             */
-/*   Updated: 2025/10/22 16:59:38 by maldavid         ###   ########.fr       */
+/*   Updated: 2025/03/12 22:03:45 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

@@ -122,6 +122,14 @@ MLX_API void mlx_pixel_put_region(mlx_context mlx, mlx_window win, int x, int y,
 *
 * Note: it is responsability of the user to make sure the size of `dst` is
 * big enough for the given region.
+ *
+ * /!\ If you run into glitches when writing or reading pixels from images /!\
+ * You need to add IMAGES_OPTIMIZED=false to your make mlx command
+ * ```
+ *     ~ git clone https://github.com/seekrs/MacroLibX.git
+ *     ~ cd MacroLibX
+ *     ~ make IMAGES_OPTIMIZED=false
+ * ```
 */
 MLX_API void mlx_get_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* dst);

@@ -138,6 +146,14 @@ MLX_API void mlx_get_image_region(mlx_context mlx, mlx_image image, int x, int y
 *
 * Note: it is responsability of the user to make sure the size of `pixels` is
 * big enough for the given region.
+ *
+ * /!\ If you run into glitches when writing or reading pixels from images /!\
+ * You need to add IMAGES_OPTIMIZED=false to your make mlx command
+ * ```
+ *     ~ git clone https://github.com/seekrs/MacroLibX.git
+ *     ~ cd MacroLibX
+ *     ~ make IMAGES_OPTIMIZED=false
+ * ```
 */
 MLX_API void mlx_set_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* pixels);

@@ -6,7 +6,7 @@
 /*   By: maldavid <kbz_8.dev@akel-engine.com>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/11/10 08:49:17 by maldavid          #+#    #+#             */
-/*   Updated: 2025/10/22 13:38:43 by maldavid         ###   ########.fr       */
+/*   Updated: 2025/03/12 22:01:07 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */

@@ -206,7 +206,7 @@

 typedef void (*mlx_function)(void);

-#define MLX_VERSION MLX_MAKE_VERSION(2, 2, 0)
+#define MLX_VERSION MLX_MAKE_VERSION(2, 0, 0)
 #define MLX_TARGET_VULKAN_API_VERSION MLX_MAKE_VERSION(1, 0, 0)

 // Checking common assumptions
@@ -0,0 +1,368 @@
+"""
+macrolibpy — thin, Pythonic bindings over MacroLibX.
+"""
+
+from __future__ import annotations
+from enum import IntEnum
+from typing import Callable, Optional, Any, List
+import os, sys
+from cffi import FFI
+import pathlib
+
+__all__ = ["Context", "Window", "Image", "Event"]
+
+ffi = FFI()
+
+# NOTE: This is a curated declaration set focused on the core API
+ffi.cdef(
+    r"""
+    typedef unsigned char uint8_t;
+    typedef unsigned int uint32_t;
+
+    typedef void (*mlx_function)(void);
+    typedef struct mlx_context_handler* mlx_context;
+    typedef struct mlx_window_handler* mlx_window;
+    typedef struct mlx_image_handler* mlx_image;
+
+    typedef struct mlx_color
+    {
+        uint32_t rgba;
+    } mlx_color;
+
+    typedef enum mlx_event_type
+    {
+        MLX_KEYDOWN = 0,
+        MLX_KEYUP = 1,
+        MLX_MOUSEDOWN = 2,
+        MLX_MOUSEUP = 3,
+        MLX_MOUSEWHEEL = 4,
+        MLX_WINDOW_EVENT = 5
+    } mlx_event_type;
+
+    typedef struct mlx_window_create_info
+    {
+        mlx_image render_target;
+        const char* title;
+        int width;
+        int height;
+        _Bool is_fullscreen;
+        _Bool is_resizable;
+    } mlx_window_create_info;
+
+    mlx_context mlx_init();
+    void mlx_set_fps_goal(mlx_context mlx, int fps);
+    void mlx_destroy_context(mlx_context mlx);
+    mlx_window mlx_new_window(mlx_context mlx, const mlx_window_create_info* info);
+    void mlx_destroy_window(mlx_context mlx, mlx_window win);
+    void mlx_set_window_position(mlx_context mlx, mlx_window win, int x, int y);
+    void mlx_set_window_size(mlx_context mlx, mlx_window win, int width, int height);
+    void mlx_set_window_title(mlx_context mlx, mlx_window win, const char* title);
+    void mlx_set_window_fullscreen(mlx_context mlx, mlx_window win, _Bool enable);
+    void mlx_get_window_position(mlx_context mlx, mlx_window win, int* x, int* y);
+    void mlx_get_window_size(mlx_context mlx, mlx_window win, int* x, int* y);
+    void mlx_clear_window(mlx_context mlx, mlx_window win, mlx_color color);
+    void mlx_get_screen_size(mlx_context mlx, mlx_window win, int* w, int* h);
+    void mlx_add_loop_hook(mlx_context mlx, void(*f)(void*), void* param);
+    void mlx_loop(mlx_context mlx);
+    void mlx_loop_end(mlx_context mlx);
+    void mlx_mouse_show(mlx_context mlx);
+    void mlx_mouse_hide(mlx_context mlx);
+    void mlx_mouse_move(mlx_context mlx, mlx_window win, int x, int y);
+    void mlx_mouse_get_pos(mlx_context mlx, int* x, int* y);
+    void mlx_on_event(mlx_context mlx, mlx_window win, mlx_event_type event, void(*f)(int, void*), void* param);
+    void mlx_pixel_put(mlx_context mlx, mlx_window win, int x, int y, mlx_color color);
+    mlx_image mlx_new_image(mlx_context mlx, int width, int height);
+    mlx_image mlx_new_image_from_file(mlx_context mlx, char* filename, int* width, int* height);
+    void mlx_destroy_image(mlx_context mlx, mlx_image image);
+    mlx_color mlx_get_image_pixel(mlx_context mlx, mlx_image image, int x, int y);
+    void mlx_set_image_pixel(mlx_context mlx, mlx_image image, int x, int y, mlx_color color);
+    void mlx_put_image_to_window(mlx_context mlx, mlx_window win, mlx_image image, int x, int y);
+    void mlx_string_put(mlx_context mlx, mlx_window win, int x, int y, mlx_color color, char* str);
+    void mlx_set_font(mlx_context mlx, char* filepath);
+    void mlx_set_font_scale(mlx_context mlx, char* filepath, float scale);
+
+    void mlx_set_window_max_size(mlx_context mlx, mlx_window win, int x, int y);
+    void mlx_set_window_min_size(mlx_context mlx, mlx_window win, int x, int y);
+    void mlx_maximise_window(mlx_context mlx, mlx_window win);
+    void mlx_minimize_window(mlx_context mlx, mlx_window win);
+    void mlx_restore_window(mlx_context mlx, mlx_window win);
+    void mlx_pixel_put_array(mlx_context mlx, mlx_window win, int x, int y, mlx_color* pixels, size_t pixels_number);
+    void mlx_pixel_put_region(mlx_context mlx, mlx_window win, int x, int y, int w, int h, mlx_color* pixels);
+    void mlx_get_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* dst);
+    void mlx_set_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* pixels);
+    void mlx_put_transformed_image_to_window(mlx_context mlx, mlx_window win, mlx_image image, int x, int y, float scale_x, float scale_y, float angle);
+    """
+)
+
+def _candidateLibNames() -> List[str]:
+    if sys.platform.startswith("linux"):
+        return ["libmlx.so"]
+    if sys.platform == "darwin":
+        return ["libmlx.dylib"]
+    if sys.platform.startswith("win"):
+        # depending on build system, either of these may exist
+        return ["mlx.dll", "libmlx.dll"]
+    return []
+
+def _candidateSdl2Names() -> List[str]:
+    if sys.platform.startswith("linux"):
+        # Try common SONAMEs (distro dependent)
+        return ["libSDL2-2.0.so.0", "libSDL2.so.0", "libSDL2.so"]
+    if sys.platform == "darwin":
+        return ["libSDL2-2.0.0.dylib", "libSDL2.dylib"]
+    if sys.platform.startswith("win"):
+        return ["SDL2.dll"]
+    return []
+
+def _loadLibrary(candidates: List[str]):
+    last_err: Optional[BaseException] = None
+    RTLD_NOW = 2
+    RTLD_GLOBAL = 0x100
+    for path in candidates:
+        try:
+            return ffi.dlopen(path, RTLD_NOW | RTLD_GLOBAL)
+        except OSError as e:
+            last_err = e
+    raise OSError(
+        f"Could not load library:\n"
+        f"\tTried: {candidates}.\n"
+        f"\tLast error: {last_err}"
+    )
+
+def _dlopenMlx():
+    _loadLibrary(_candidateSdl2Names())
+    candidates: List[str] = []
+    for name in _candidateLibNames():
+        candidates.append(os.path.join(pathlib.Path(__file__).parent.parent.resolve(), name))
+    return _loadLibrary(candidates)
+
+lib = _dlopenMlx()
+
+class EventType(IntEnum):
+    KEYDOWN = 0
+    KEYUP = 1
+    MOUSEDOWN = 2
+    MOUSEUP = 3
+    MOUSEWHEEL = 4
+    WINDOW_EVENT = 5
+
+class MlxError(RuntimeError):
+    pass
+
+# Keep Python references to cffi callbacks alive
+_alive_callbacks: List[Any] = []
+
+def _makeLoopCallback(pyfunc: Callable[[], None]):
+    @ffi.callback("void(void*)")
+    def cfunc(userdata):
+        pyfunc()
+    _alive_callbacks.append(cfunc)
+    return cfunc
+
+def _makeEventCallback(pyfunc: Callable[[int], None]):
+    @ffi.callback("void(int, void*)")
+    def cfunc(event, userdata):
+        pyfunc(int(event))
+    _alive_callbacks.append(cfunc)
+    return cfunc
+
+def _rgbaToColor(rgba: int):
+    c = ffi.new("mlx_color*")
+    c[0].rgba = int(rgba) & 0xFFFFFFFF
+    return c[0]
+
+class Context:
+    __slots__ = ("_ctx",)
+
+    def __init__(self, _ptr) -> None:
+        self._ctx = _ptr
+
+    @classmethod
+    def create(cls) -> "Context":
+        ctx = lib.mlx_init()
+        if ctx == ffi.NULL:
+            raise MlxError("mlx_init failed")
+        return cls(ctx)
+
+    def set_fps_goal(self, fps: int) -> None:
+        lib.mlx_set_fps_goal(self._ctx, int(fps))
+
+    def add_loop_hook(self, fn: Callable[[], None]) -> None:
+        lib.mlx_add_loop_hook(self._ctx, _makeLoopCallback(fn), ffi.NULL)
+
+    def new_window(
+        self,
+        width: int,
+        height: int,
+        title: str,
+        resizable: bool = True,
+        fullscreen: bool = False,
+    ) -> "Window":
+        ffi_title = ffi.new("char[]", title.encode('ascii', 'replace'))
+
+        info = ffi.new("mlx_window_create_info*")
+        info.render_target = ffi.NULL
+        info.title = ffi_title
+        info.width = int(width)
+        info.height = int(height)
+        info.is_fullscreen = bool(fullscreen)
+        info.is_resizable = bool(resizable)
+        win = lib.mlx_new_window(self._ctx, info)
+        if win == ffi.NULL:
+            raise MlxError("mlx_new_window failed")
+        return Window(self, win)
+
+    def new_image(self, width: int, height: int) -> "Image":
+        img = lib.mlx_new_image(self._ctx, int(width), int(height))
+        if img == ffi.NULL:
+            raise MlxError("mlx_new_image failed")
+        return Image(self, img)
+
+    def new_image_from_file(self, path: str) -> Tuple["Image", int, int]:
+        w = ffi.new("int[]", 1);
+        h = ffi.new("int[]", 1);
+        ffi_path = ffi.new("char[]", path.encode('ascii'))
+        img = lib.mlx_new_image_from_file(self._ctx, ffi_path, w, h)
+        if img == ffi.NULL:
+            raise MlxError("mlx_new_image failed")
+        return (Image(self, img), w, h)
+
+    def loop(self) -> None:
+        lib.mlx_loop(self._ctx)
+
+    def loop_end(self) -> None:
+        lib.mlx_loop_end(self._ctx)
+
+    def destroy(self) -> None:
+        if getattr(self, "_ctx", None):
+            lib.mlx_destroy_context(self._ctx)
+            self._ctx = ffi.NULL
+
+    def mouse_show(self) -> None:
+        lib.mlx_mouse_show(self._ctx)
+
+    def mouse_hide(self) -> None:
+        lib.mlx_mouse_hide(self._ctx)
+
+    def mouse_move(self, x: int, y: int) -> None:
+        lib.mlx_mouse_move(self._ctx, int(x), int(y))
+
+    def get_mouse_position(self) -> Tuple[int, int]:
+        x = ffi.new("int[]", 1);
+        y = ffi.new("int[]", 1);
+        lib.mlx_mouse_get_pos(self._ctx, x, y)
+        return (x[0], y[0])
+
+    def set_font(self, path: str) -> None:
+        ffi_path = ffi.new("char[]", path.encode('ascii'))
+        lib.mlx_set_font(self._ctx, ffi_path)
+
+    def set_font_scale(self, path: str, scale: float) -> None:
+        ffi_path = ffi.new("char[]", path.encode('ascii'))
+        lib.mlx_set_font_scale(self._ctx, ffi_path, float(scale))
+
+    def __del__(self):
+        try:
+            self.destroy()
+        except Exception:
+            pass
+
+class Window:
+    __slots__ = ("_ctx", "_win")
+
+    def __init__(self, ctx: Context, win) -> None:
+        self._ctx = ctx
+        self._win = win
+
+    def set_title(self, title: str) -> None:
+        ffi_title = ffi.new("char[]", title.encode('ascii', 'replace'))
+        lib.mlx_set_window_title(self._ctx._ctx, self._win, ffi_title)
+
+    def set_position(self, x: int, y: int) -> None:
+        lib.mlx_set_window_position(self._ctx._ctx, self._win, int(x), int(y))
+
+    def set_size(self, w: int, h: int) -> None:
+        lib.mlx_set_window_size(self._ctx._ctx, self._win, int(w), int(h))
+
+    def set_fullscreen(self, enable: bool) -> None:
+        lib.mlx_set_window_fullscreen(self._ctx._ctx, self._win, bool(enable))
+
+    def get_position(self) -> Tuple[int, int]:
+        x = ffi.new("int[]", 1);
+        y = ffi.new("int[]", 1);
+        lib.mlx_get_window_position(self._ctx._ctx, self._win, x, y)
+        return (x[0], y[0])
+
+    def get_size(self) -> Tuple[int, int]:
+        w = ffi.new("int[]", 1);
+        h = ffi.new("int[]", 1);
+        lib.mlx_get_window_size(self._ctx._ctx, self._win, w, h)
+        return (w[0], h[0])
+
+    def get_screen_size(self) -> Tuple[int, int]:
+        w = ffi.new("int[]", 1);
+        h = ffi.new("int[]", 1);
+        lib.mlx_get_screen_size(self._ctx._ctx, self._win, w, h)
+        return (w[0], h[0])
+
+    def clear(self, rgba: int = 0) -> None:
+        lib.mlx_clear_window(self._ctx._ctx, self._win, _rgbaToColor(rgba))
+
+    def pixel_put(self, x: int, y: int, rgba: int) -> None:
+        lib.mlx_pixel_put(self._ctx._ctx, self._win, int(x), int(y), _rgbaToColor(rgba))
+
+    def pixel_put_array(self, x: int, y: int, rgba: list[int]) -> None:
+        ffi_pixels = ffi.new("mlx_color[]", [_rgbaToColor(pixel) for pixel in rgba])
+        lib.mlx_pixel_put_array(self._ctx._ctx, self._win, int(x), int(y), ffi_pixels, int(rgba.len()))
+
+    def pixel_put_region(self, x: int, y: int, w: int, h: int, rgba: list[int]) -> None:
+        ffi_pixels = ffi.new("mlx_color[]", [_rgbaToColor(pixel) for pixel in rgba])
+        lib.mlx_pixel_put_region(self._ctx._ctx, self._win, int(x), int(y), int(w), int(h), ffi_pixels)
+
+    def put_image(self, image: "Image", x: int, y: int) -> None:
+        lib.mlx_put_image_to_window(self._ctx._ctx, self._win, image._img, int(x), int(y))
+
+    def put_transformed_image(self, image: "Image", x: int, y: int, scale_x: float, scale_y: float, angle: float) -> None:
+        lib.mlx_put_transformed_image_to_window(self._ctx._ctx, self._win, image._img, int(x), int(y), float(scale_x), float(scale_y), float(angle))
+
+    def string_put(self, x: int, y: int, rgba: int, text: str) -> None:
+        ffi_text = ffi.new("char[]", text.encode('ascii', 'replace'))
+        lib.mlx_string_put(self._ctx._ctx, self._win, int(x), int(y), _rgbaToColor(rgba), ffi_text)
+
+    def on_event(self, event_type: EventType | int, fn: Callable[[int], None]) -> None:
+        lib.mlx_on_event(self._ctx._ctx, self._win, int(event_type), _makeEventCallback(fn), ffi.NULL)
+
+    def destroy(self) -> None:
+        if getattr(self, "_win", None):
+            lib.mlx_destroy_window(self._ctx._ctx, self._win)
+            self._win = ffi.NULL
+
+    def __del__(self):
+        try:
+            self.destroy()
+        except Exception:
+            pass
+
+class Image:
+    __slots__ = ("_ctx", "_img")
+
+    def __init__(self, ctx: Context, img) -> None:
+        self._ctx = ctx
+        self._img = img
+
+    def set_pixel(self, x: int, y: int, rgba: int) -> None:
+        lib.mlx_set_image_pixel(self._ctx._ctx, self._img, int(x), int(y), _rgbaToColor(rgba))
+
+    def get_pixel(self, x: int, y: int) -> int:
+        return lib.mlx_get_image_pixel(self._ctx._ctx, self._img, int(x), int(y))
+
+    def destroy(self) -> None:
+        if getattr(self, "_img", None):
+            lib.mlx_destroy_image(self._ctx._ctx, self._img)
+            self._img = ffi.NULL
+
+    def __del__(self):
+        try:
+            self.destroy()
+        except Exception:
+            pass
@@ -50,7 +50,7 @@ namespace mlx
 			~DescriptorPoolManager() = default;

 		private:
-			std::vector<std::unique_ptr<DescriptorPool>> m_pools;
+			std::vector<DescriptorPool> m_pools;
 	};

 	class DescriptorSet : public std::enable_shared_from_this<DescriptorSet>
@@ -38,8 +38,8 @@ namespace mlx

 		private:
 			Swapchain m_swapchain;
-			std::vector<VkSemaphore> m_render_finished_semaphores;
 			std::array<VkSemaphore, MAX_FRAMES_IN_FLIGHT> m_image_available_semaphores;
+			std::array<VkSemaphore, MAX_FRAMES_IN_FLIGHT> m_render_finished_semaphores;
 			std::array<VkCommandBuffer, MAX_FRAMES_IN_FLIGHT> m_cmd_buffers;
 			std::array<VkFence, MAX_FRAMES_IN_FLIGHT> m_cmd_fences;
 			NonOwningPtr<Window> p_window;
@@ -114,8 +114,11 @@ namespace mlx

 	void DescriptorPool::ReturnDescriptorSet(std::shared_ptr<DescriptorSet> set)
 	{
+		//std::size_t i = 0;
 		auto it = std::find_if(m_used_sets.begin(), m_used_sets.end(), [&](const std::shared_ptr<DescriptorSet>& rhs_set)
 		{
+			//i++;
+			//std::cout << m_used_sets.size() << " " << i << std::endl;
 			return set == rhs_set;
 		});
 		if(it == m_used_sets.end())
@@ -129,18 +132,18 @@ namespace mlx
 		MLX_PROFILE_FUNCTION();
 		for(auto& pool : m_pools)
 		{
-			if(pool->GetNumberOfSetsAllocated() < MAX_SETS_PER_POOL)
-				return *pool;
+			if(pool.GetNumberOfSetsAllocated() < MAX_SETS_PER_POOL)
+				return pool;
 		}
-		m_pools.emplace_back(std::make_unique<DescriptorPool>())->Init();
-		return *m_pools.back();
+		m_pools.emplace_back().Init();
+		return m_pools.back();
 	}

 	void DescriptorPoolManager::Destroy()
 	{
 		MLX_PROFILE_FUNCTION();
 		for(auto& pool : m_pools)
-			pool->Destroy();
+			pool.Destroy();
 		m_pools.clear();
 	}

@@ -22,6 +22,12 @@
 	#include <stb_image.h>
 #endif

+#ifdef IMAGE_OPTIMIZED
+	#define TILING VK_IMAGE_TILING_OPTIMAL
+#else
+	#define TILING VK_IMAGE_TILING_LINEAR
+#endif
+
 namespace mlx
 {
 	mlx_color ReverseColor(mlx_color color)
@@ -180,7 +186,7 @@ namespace mlx
 	void Texture::Init(CPUBuffer pixels, std::uint32_t width, std::uint32_t height, VkFormat format, bool is_multisampled, [[maybe_unused]] std::string_view debug_name)
 	{
 		MLX_PROFILE_FUNCTION();
-		Image::Init(ImageType::Color, width, height, format, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, is_multisampled, std::move(debug_name));
+		Image::Init(ImageType::Color, width, height, format, TILING, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, is_multisampled, std::move(debug_name));
 		Image::CreateImageView(VK_IMAGE_VIEW_TYPE_2D, VK_IMAGE_ASPECT_COLOR_BIT);
 		Image::CreateSampler();
 		if(pixels)
@@ -20,42 +20,29 @@ namespace mlx
 		MLX_PROFILE_FUNCTION();
 		p_window = window;
 		m_swapchain.Init(p_window);
-		Init(NonOwningPtr<Texture>{ nullptr });
+		for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
+		{
+			m_image_available_semaphores[i] = kvfCreateSemaphore(RenderCore::Get().GetDevice());
+			DebugLog("Vulkan: image available semaphore created");
+			m_render_finished_semaphores[i] = kvfCreateSemaphore(RenderCore::Get().GetDevice());
+			DebugLog("Vulkan: render finished semaphore created");
+			m_cmd_buffers[i] = kvfCreateCommandBuffer(RenderCore::Get().GetDevice());
+			DebugLog("Vulkan: command buffer created");
+			m_cmd_fences[i] = kvfCreateFence(RenderCore::Get().GetDevice());
+			DebugLog("Vulkan: fence created");
+		}
 	}

 	void Renderer::Init(NonOwningPtr<Texture> render_target)
 	{
 		MLX_PROFILE_FUNCTION();
-		std::function<void(const EventBase&)> functor = [this](const EventBase& event)
-		{
-			if(event.What() == Event::ResizeEventCode)
-			{
-				for(std::size_t i = 0; i < m_render_finished_semaphores.size(); i++)
-				{
-					kvfDestroySemaphore(RenderCore::Get().GetDevice(), m_render_finished_semaphores[i]);
-					DebugLog("Vulkan: render finished semaphore destroyed");
-				}
-				m_render_finished_semaphores.clear();
-				for(std::size_t i = 0; i < (p_window ? m_swapchain.GetImagesCount() : 1); i++)
-				{
-					m_render_finished_semaphores.push_back(kvfCreateSemaphore(RenderCore::Get().GetDevice()));
-					DebugLog("Vulkan: render finished semaphore created");
-				}
-			}
-		};
-		EventBus::RegisterListener({ functor, "mlx_renderer_" + std::to_string(reinterpret_cast<std::uintptr_t>(this)) });
-
-		if(render_target)
 		p_render_target = render_target;
-		for(std::size_t i = 0; i < (p_window ? m_swapchain.GetImagesCount() : 1); i++)
-		{
-			m_render_finished_semaphores.push_back(kvfCreateSemaphore(RenderCore::Get().GetDevice()));
-			DebugLog("Vulkan: render finished semaphore created");
-		}
 		for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
 		{
 			m_image_available_semaphores[i] = kvfCreateSemaphore(RenderCore::Get().GetDevice());
 			DebugLog("Vulkan: image available semaphore created");
+			m_render_finished_semaphores[i] = kvfCreateSemaphore(RenderCore::Get().GetDevice());
+			DebugLog("Vulkan: render finished semaphore created");
 			m_cmd_buffers[i] = kvfCreateCommandBuffer(RenderCore::Get().GetDevice());
 			DebugLog("Vulkan: command buffer created");
 			m_cmd_fences[i] = kvfCreateFence(RenderCore::Get().GetDevice());
@@ -79,15 +66,14 @@ namespace mlx
 	void Renderer::EndFrame()
 	{
 		MLX_PROFILE_FUNCTION();
-		std::size_t render_finished_index = (p_window ? m_swapchain.GetImageIndex() : 0);
 		VkPipelineStageFlags wait_stages[] = { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT };
 		kvfEndCommandBuffer(m_cmd_buffers[m_current_frame_index]);
 		if(p_window)
-			kvfSubmitCommandBuffer(RenderCore::Get().GetDevice(), m_cmd_buffers[m_current_frame_index], KVF_GRAPHICS_QUEUE, m_render_finished_semaphores[render_finished_index], m_image_available_semaphores[m_current_frame_index], m_cmd_fences[m_current_frame_index], wait_stages);
+			kvfSubmitCommandBuffer(RenderCore::Get().GetDevice(), m_cmd_buffers[m_current_frame_index], KVF_GRAPHICS_QUEUE, m_render_finished_semaphores[m_current_frame_index], m_image_available_semaphores[m_current_frame_index], m_cmd_fences[m_current_frame_index], wait_stages);
 		else
 			kvfSubmitCommandBuffer(RenderCore::Get().GetDevice(), m_cmd_buffers[m_current_frame_index], KVF_GRAPHICS_QUEUE, VK_NULL_HANDLE, VK_NULL_HANDLE, m_cmd_fences[m_current_frame_index], wait_stages);
 		if(p_window)
-			m_swapchain.Present(m_render_finished_semaphores[render_finished_index]);
+			m_swapchain.Present(m_render_finished_semaphores[m_current_frame_index]);
 		m_current_frame_index = (m_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT;
 	}

@@ -95,16 +81,12 @@ namespace mlx
 	{
 		MLX_PROFILE_FUNCTION();
 		RenderCore::Get().WaitDeviceIdle();
-		for(std::size_t i = 0; i < m_render_finished_semaphores.size(); i++)
-		{
-			kvfDestroySemaphore(RenderCore::Get().GetDevice(), m_render_finished_semaphores[i]);
-			DebugLog("Vulkan: render finished semaphore destroyed");
-		}
-		m_render_finished_semaphores.clear();
 		for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
 		{
 			kvfDestroySemaphore(RenderCore::Get().GetDevice(), m_image_available_semaphores[i]);
 			DebugLog("Vulkan: image available semaphore destroyed");
+			kvfDestroySemaphore(RenderCore::Get().GetDevice(), m_render_finished_semaphores[i]);
+			DebugLog("Vulkan: render finished semaphore destroyed");
 			kvfDestroyCommandBuffer(RenderCore::Get().GetDevice(), m_cmd_buffers[i]);
 			DebugLog("Vulkan: command buffer destroyed");
 			kvfDestroyFence(RenderCore::Get().GetDevice(), m_cmd_fences[i]);
@@ -1,7 +1,7 @@
 /***
 *                              MIT License
 *
- *                      Copyright (c) 2023-2025 kbz_8
+ *                      Copyright (c) 2023-2024 kbz_8
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,27 +22,27 @@ extern "C" {
 // vulkan_video_codec_av1std is a preprocessor guard. Do not pass it to API calls.
 #define vulkan_video_codec_av1std 1
 #include "vulkan_video_codecs_common.h"
-#define STD_VIDEO_AV1_NUM_REF_FRAMES      8U
-#define STD_VIDEO_AV1_REFS_PER_FRAME      7U
-#define STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME 8U
-#define STD_VIDEO_AV1_MAX_TILE_COLS       64U
-#define STD_VIDEO_AV1_MAX_TILE_ROWS       64U
-#define STD_VIDEO_AV1_MAX_SEGMENTS        8U
-#define STD_VIDEO_AV1_SEG_LVL_MAX         8U
-#define STD_VIDEO_AV1_PRIMARY_REF_NONE    7U
-#define STD_VIDEO_AV1_SELECT_INTEGER_MV   2U
-#define STD_VIDEO_AV1_SELECT_SCREEN_CONTENT_TOOLS 2U
-#define STD_VIDEO_AV1_SKIP_MODE_FRAMES    2U
-#define STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS 4U
-#define STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS 2U
-#define STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS 8U
-#define STD_VIDEO_AV1_MAX_NUM_PLANES      3U
-#define STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS 6U
-#define STD_VIDEO_AV1_MAX_NUM_Y_POINTS    14U
-#define STD_VIDEO_AV1_MAX_NUM_CB_POINTS   10U
-#define STD_VIDEO_AV1_MAX_NUM_CR_POINTS   10U
-#define STD_VIDEO_AV1_MAX_NUM_POS_LUMA    24U
-#define STD_VIDEO_AV1_MAX_NUM_POS_CHROMA  25U
+#define STD_VIDEO_AV1_NUM_REF_FRAMES      8
+#define STD_VIDEO_AV1_REFS_PER_FRAME      7
+#define STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME 8
+#define STD_VIDEO_AV1_MAX_TILE_COLS       64
+#define STD_VIDEO_AV1_MAX_TILE_ROWS       64
+#define STD_VIDEO_AV1_MAX_SEGMENTS        8
+#define STD_VIDEO_AV1_SEG_LVL_MAX         8
+#define STD_VIDEO_AV1_PRIMARY_REF_NONE    7
+#define STD_VIDEO_AV1_SELECT_INTEGER_MV   2
+#define STD_VIDEO_AV1_SELECT_SCREEN_CONTENT_TOOLS 2
+#define STD_VIDEO_AV1_SKIP_MODE_FRAMES    2
+#define STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS 4
+#define STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS 2
+#define STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS 8
+#define STD_VIDEO_AV1_MAX_NUM_PLANES      3
+#define STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS 6
+#define STD_VIDEO_AV1_MAX_NUM_Y_POINTS    14
+#define STD_VIDEO_AV1_MAX_NUM_CB_POINTS   10
+#define STD_VIDEO_AV1_MAX_NUM_CR_POINTS   10
+#define STD_VIDEO_AV1_MAX_NUM_POS_LUMA    24
+#define STD_VIDEO_AV1_MAX_NUM_POS_CHROMA  25

 typedef enum StdVideoAV1Profile {
    STD_VIDEO_AV1_PROFILE_MAIN = 0,
@@ -22,14 +22,14 @@ extern "C" {
 // vulkan_video_codec_h264std is a preprocessor guard. Do not pass it to API calls.
 #define vulkan_video_codec_h264std 1
 #include "vulkan_video_codecs_common.h"
-#define STD_VIDEO_H264_CPB_CNT_LIST_SIZE  32U
-#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS 6U
-#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS 16U
-#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS 6U
-#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS 64U
-#define STD_VIDEO_H264_MAX_NUM_LIST_REF   32U
-#define STD_VIDEO_H264_MAX_CHROMA_PLANES  2U
-#define STD_VIDEO_H264_NO_REFERENCE_PICTURE 0xFFU
+#define STD_VIDEO_H264_CPB_CNT_LIST_SIZE  32
+#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS 6
+#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS 16
+#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS 6
+#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS 64
+#define STD_VIDEO_H264_MAX_NUM_LIST_REF   32
+#define STD_VIDEO_H264_MAX_CHROMA_PLANES  2
+#define STD_VIDEO_H264_NO_REFERENCE_PICTURE 0xFF

 typedef enum StdVideoH264ChromaFormatIdc {
    STD_VIDEO_H264_CHROMA_FORMAT_IDC_MONOCHROME = 0,
@@ -27,7 +27,7 @@ extern "C" {

 #define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_API_VERSION_1_0_0
 #define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h264_decode"
-#define STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE 2U
+#define STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE 2

 typedef enum StdVideoDecodeH264FieldOrderCount {
    STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_TOP = 0,
@@ -22,29 +22,29 @@ extern "C" {
 // vulkan_video_codec_h265std is a preprocessor guard. Do not pass it to API calls.
 #define vulkan_video_codec_h265std 1
 #include "vulkan_video_codecs_common.h"
-#define STD_VIDEO_H265_CPB_CNT_LIST_SIZE  32U
-#define STD_VIDEO_H265_SUBLAYERS_LIST_SIZE 7U
-#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS 6U
-#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS 16U
-#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS 6U
-#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS 64U
-#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS 6U
-#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS 64U
-#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS 2U
-#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS 64U
-#define STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE 6U
-#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE 19U
-#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE 21U
-#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE 3U
-#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE 128U
-#define STD_VIDEO_H265_MAX_NUM_LIST_REF   15U
-#define STD_VIDEO_H265_MAX_CHROMA_PLANES  2U
-#define STD_VIDEO_H265_MAX_SHORT_TERM_REF_PIC_SETS 64U
-#define STD_VIDEO_H265_MAX_DPB_SIZE       16U
-#define STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS 32U
-#define STD_VIDEO_H265_MAX_LONG_TERM_PICS 16U
-#define STD_VIDEO_H265_MAX_DELTA_POC      48U
-#define STD_VIDEO_H265_NO_REFERENCE_PICTURE 0xFFU
+#define STD_VIDEO_H265_CPB_CNT_LIST_SIZE  32
+#define STD_VIDEO_H265_SUBLAYERS_LIST_SIZE 7
+#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS 6
+#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS 16
+#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS 6
+#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS 64
+#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS 6
+#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS 64
+#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS 2
+#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS 64
+#define STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE 6
+#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE 19
+#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE 21
+#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE 3
+#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE 128
+#define STD_VIDEO_H265_MAX_NUM_LIST_REF   15
+#define STD_VIDEO_H265_MAX_CHROMA_PLANES  2
+#define STD_VIDEO_H265_MAX_SHORT_TERM_REF_PIC_SETS 64
+#define STD_VIDEO_H265_MAX_DPB_SIZE       16
+#define STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS 32
+#define STD_VIDEO_H265_MAX_LONG_TERM_PICS 16
+#define STD_VIDEO_H265_MAX_DELTA_POC      48
+#define STD_VIDEO_H265_NO_REFERENCE_PICTURE 0xFF

 typedef enum StdVideoH265ChromaFormatIdc {
    STD_VIDEO_H265_CHROMA_FORMAT_IDC_MONOCHROME = 0,
@@ -27,7 +27,7 @@ extern "C" {

 #define VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_API_VERSION_1_0_0
 #define VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h265_decode"
-#define STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE 8U
+#define STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE 8
 typedef struct StdVideoDecodeH265PictureInfoFlags {
    uint32_t    IrapPicFlag : 1;
    uint32_t    IdrPicFlag  : 1;
@@ -22,14 +22,14 @@ extern "C" {
 // vulkan_video_codec_vp9std is a preprocessor guard. Do not pass it to API calls.
 #define vulkan_video_codec_vp9std 1
 #include "vulkan_video_codecs_common.h"
-#define STD_VIDEO_VP9_NUM_REF_FRAMES      8U
-#define STD_VIDEO_VP9_REFS_PER_FRAME      3U
-#define STD_VIDEO_VP9_MAX_REF_FRAMES      4U
-#define STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS 2U
-#define STD_VIDEO_VP9_MAX_SEGMENTS        8U
-#define STD_VIDEO_VP9_SEG_LVL_MAX         4U
-#define STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS 7U
-#define STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB 3U
+#define STD_VIDEO_VP9_NUM_REF_FRAMES      8
+#define STD_VIDEO_VP9_REFS_PER_FRAME      3
+#define STD_VIDEO_VP9_MAX_REF_FRAMES      4
+#define STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS 2
+#define STD_VIDEO_VP9_MAX_SEGMENTS        8
+#define STD_VIDEO_VP9_SEG_LVL_MAX         4
+#define STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS 7
+#define STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB 3

 typedef enum StdVideoVP9Profile {
    STD_VIDEO_VP9_PROFILE_0 = 0,
@@ -337,37 +337,6 @@ typedef struct VkAccelerationStructureTrianglesDisplacementMicromapNV {
 } VkAccelerationStructureTrianglesDisplacementMicromapNV;


-
-// VK_AMDX_dense_geometry_format is a preprocessor guard. Do not pass it to API calls.
-#define VK_AMDX_dense_geometry_format 1
-#define VK_AMDX_DENSE_GEOMETRY_FORMAT_SPEC_VERSION 1
-#define VK_AMDX_DENSE_GEOMETRY_FORMAT_EXTENSION_NAME "VK_AMDX_dense_geometry_format"
-#define VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_BYTE_ALIGNMENT_AMDX 128U
-#define VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_BYTE_STRIDE_AMDX 128U
-
-typedef enum VkCompressedTriangleFormatAMDX {
-    VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_AMDX = 0,
-    VK_COMPRESSED_TRIANGLE_FORMAT_MAX_ENUM_AMDX = 0x7FFFFFFF
-} VkCompressedTriangleFormatAMDX;
-typedef struct VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           denseGeometryFormat;
-} VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX;
-
-typedef struct VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX {
-    VkStructureType                   sType;
-    const void*                       pNext;
-    VkDeviceOrHostAddressConstKHR     compressedData;
-    VkDeviceSize                      dataSize;
-    uint32_t                          numTriangles;
-    uint32_t                          numVertices;
-    uint32_t                          maxPrimitiveIndex;
-    uint32_t                          maxGeometryIndex;
-    VkCompressedTriangleFormatAMDX    format;
-} VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX;
-
-
 #ifdef __cplusplus
 }
 #endif
@@ -69,7 +69,7 @@ extern "C" {
 #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0

 // Version of this file
-#define VK_HEADER_VERSION 329
+#define VK_HEADER_VERSION 320

 // Complete version of this file
 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 4, VK_HEADER_VERSION)
@@ -157,7 +157,6 @@ typedef enum VkResult {
    VK_ERROR_FORMAT_NOT_SUPPORTED = -11,
    VK_ERROR_FRAGMENTED_POOL = -12,
    VK_ERROR_UNKNOWN = -13,
-    VK_ERROR_VALIDATION_FAILED = -1000011001,
    VK_ERROR_OUT_OF_POOL_MEMORY = -1000069000,
    VK_ERROR_INVALID_EXTERNAL_HANDLE = -1000072003,
    VK_ERROR_FRAGMENTATION = -1000161000,
@@ -169,6 +168,7 @@ typedef enum VkResult {
    VK_SUBOPTIMAL_KHR = 1000001003,
    VK_ERROR_OUT_OF_DATE_KHR = -1000001004,
    VK_ERROR_INCOMPATIBLE_DISPLAY_KHR = -1000003001,
+    VK_ERROR_VALIDATION_FAILED_EXT = -1000011001,
    VK_ERROR_INVALID_SHADER_NV = -1000012000,
    VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR = -1000023000,
    VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR = -1000023001,
@@ -187,7 +187,6 @@ typedef enum VkResult {
    VK_INCOMPATIBLE_SHADER_BINARY_EXT = 1000482000,
    VK_PIPELINE_BINARY_MISSING_KHR = 1000483000,
    VK_ERROR_NOT_ENOUGH_SPACE_KHR = -1000483000,
-    VK_ERROR_VALIDATION_FAILED_EXT = VK_ERROR_VALIDATION_FAILED,
    VK_ERROR_OUT_OF_POOL_MEMORY_KHR = VK_ERROR_OUT_OF_POOL_MEMORY,
    VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR = VK_ERROR_INVALID_EXTERNAL_HANDLE,
    VK_ERROR_FRAGMENTATION_EXT = VK_ERROR_FRAGMENTATION,
@@ -808,6 +807,15 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_PROPERTIES_EXT = 1000272001,
    VK_STRUCTURE_TYPE_MEMORY_MAP_PLACED_INFO_EXT = 1000272002,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT = 1000273000,
+    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT = 1000274000,
+    VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT = 1000274001,
+    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT = 1000274002,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT = 1000275000,
+    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT = 1000275001,
+    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT = 1000275002,
+    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT = 1000275003,
+    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT = 1000275004,
+    VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT = 1000275005,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV = 1000277000,
    VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV = 1000277001,
    VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV = 1000277002,
@@ -935,6 +943,7 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT = 1000355000,
    VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT = 1000355001,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT = 1000356000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_EXT = 1000361000,
    VK_STRUCTURE_TYPE_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA = 1000364000,
    VK_STRUCTURE_TYPE_MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA = 1000364001,
    VK_STRUCTURE_TYPE_MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA = 1000364002,
@@ -969,11 +978,6 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT = 1000381001,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT = 1000382000,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAINTENANCE_1_FEATURES_KHR = 1000386000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNTYPED_POINTERS_FEATURES_KHR = 1000387000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_RGB_CONVERSION_FEATURES_VALVE = 1000390000,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_RGB_CONVERSION_CAPABILITIES_VALVE = 1000390001,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_PROFILE_RGB_CONVERSION_INFO_VALVE = 1000390002,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_RGB_CONVERSION_CREATE_INFO_VALVE = 1000390003,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT = 1000391000,
    VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT = 1000391001,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT = 1000392000,
@@ -1022,6 +1026,7 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM = 1000424003,
    VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM = 1000424004,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV = 1000426000,
+    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV = 1000426001,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_FEATURES_NV = 1000427000,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_DECOMPRESSION_PROPERTIES_NV = 1000427001,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_COMPUTE_FEATURES_NV = 1000428000,
@@ -1090,12 +1095,6 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ANTI_LAG_FEATURES_AMD = 1000476000,
    VK_STRUCTURE_TYPE_ANTI_LAG_DATA_AMD = 1000476001,
    VK_STRUCTURE_TYPE_ANTI_LAG_PRESENTATION_INFO_AMD = 1000476002,
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DENSE_GEOMETRY_FORMAT_FEATURES_AMDX = 1000478000,
-#endif
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DENSE_GEOMETRY_FORMAT_TRIANGLES_DATA_AMDX = 1000478001,
-#endif
    VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_PRESENT_ID_2_KHR = 1000479000,
    VK_STRUCTURE_TYPE_PRESENT_ID_2_KHR = 1000479001,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_2_FEATURES_KHR = 1000479002,
@@ -1120,15 +1119,6 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_TILE_PROPERTIES_QCOM = 1000484001,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_AMIGO_PROFILING_FEATURES_SEC = 1000485000,
    VK_STRUCTURE_TYPE_AMIGO_PROFILING_SUBMIT_INFO_SEC = 1000485001,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_KHR = 1000274000,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_KHR = 1000274001,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_KHR = 1000274002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_KHR = 1000275000,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_KHR = 1000275001,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_KHR = 1000275002,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_KHR = 1000275003,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_KHR = 1000275004,
-    VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_KHR = 1000275005,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM = 1000488000,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV = 1000490000,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV = 1000490001,
@@ -1233,17 +1223,8 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_TILE_MEMORY_REQUIREMENTS_QCOM = 1000547002,
    VK_STRUCTURE_TYPE_TILE_MEMORY_BIND_INFO_QCOM = 1000547003,
    VK_STRUCTURE_TYPE_TILE_MEMORY_SIZE_INFO_QCOM = 1000547004,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_KHR = 1000549000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_KHR = 1000426001,
-    VK_STRUCTURE_TYPE_COPY_MEMORY_INDIRECT_INFO_KHR = 1000549002,
-    VK_STRUCTURE_TYPE_COPY_MEMORY_TO_IMAGE_INDIRECT_INFO_KHR = 1000549003,
    VK_STRUCTURE_TYPE_DISPLAY_SURFACE_STEREO_CREATE_INFO_NV = 1000551000,
    VK_STRUCTURE_TYPE_DISPLAY_MODE_STEREO_PROPERTIES_NV = 1000551001,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_CAPABILITIES_KHR = 1000552000,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_INTRA_REFRESH_CREATE_INFO_KHR = 1000552001,
-    VK_STRUCTURE_TYPE_VIDEO_ENCODE_INTRA_REFRESH_INFO_KHR = 1000552002,
-    VK_STRUCTURE_TYPE_VIDEO_REFERENCE_INTRA_REFRESH_INFO_KHR = 1000552003,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_ENCODE_INTRA_REFRESH_FEATURES_KHR = 1000552004,
    VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_CAPABILITIES_KHR = 1000553000,
    VK_STRUCTURE_TYPE_VIDEO_FORMAT_QUANTIZATION_MAP_PROPERTIES_KHR = 1000553001,
    VK_STRUCTURE_TYPE_VIDEO_ENCODE_QUANTIZATION_MAP_INFO_KHR = 1000553002,
@@ -1303,7 +1284,6 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_FEATURES_MESA = 1000575000,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_PROPERTIES_MESA = 1000575001,
    VK_STRUCTURE_TYPE_IMAGE_ALIGNMENT_CONTROL_CREATE_INFO_MESA = 1000575002,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR = 1000579000,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_CONTROL_FEATURES_EXT = 1000582000,
    VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLAMP_CONTROL_CREATE_INFO_EXT = 1000582001,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR = 1000584000,
@@ -1313,7 +1293,7 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_INLINE_SESSION_PARAMETERS_INFO_KHR = 1000586001,
    VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_INLINE_SESSION_PARAMETERS_INFO_KHR = 1000586002,
    VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_INLINE_SESSION_PARAMETERS_INFO_KHR = 1000586003,
-    VK_STRUCTURE_TYPE_SURFACE_CREATE_INFO_OHOS = 1000685000,
+    VK_STRUCTURE_TYPE_OH_SURFACE_CREATE_INFO_OHOS = 1000587000,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HDR_VIVID_FEATURES_HUAWEI = 1000590000,
    VK_STRUCTURE_TYPE_HDR_VIVID_DYNAMIC_METADATA_HUAWEI = 1000590001,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_2_FEATURES_NV = 1000593000,
@@ -1342,8 +1322,6 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT = 1000425002,
    VK_STRUCTURE_TYPE_RENDERING_END_INFO_EXT = 1000619003,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_DEVICE_MEMORY_FEATURES_EXT = 1000620000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_KHR = 1000361000,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CACHE_INCREMENTAL_MODE_FEATURES_SEC = 1000637000,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES,
  // VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT is a deprecated alias
@@ -1510,15 +1488,6 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT = VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY,
    VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR = VK_STRUCTURE_TYPE_MEMORY_MAP_INFO,
    VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR = VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_KHR,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT = VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_KHR,
-    VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_KHR,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_KHR,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_EXT = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_FENCE_INFO_KHR,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODES_CREATE_INFO_KHR,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_EXT = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_MODE_INFO_KHR,
-    VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_SWAPCHAIN_PRESENT_SCALING_CREATE_INFO_KHR,
-    VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_EXT = VK_STRUCTURE_TYPE_RELEASE_SWAPCHAIN_IMAGES_INFO_KHR,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES,
@@ -1556,7 +1525,6 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT,
    VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE = VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT,
    VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_MODE_FIFO_LATEST_READY_FEATURES_KHR,
    VK_STRUCTURE_TYPE_PIPELINE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES,
    VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES,
@@ -1569,7 +1537,6 @@ typedef enum VkStructureType {
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_EXT,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_EXT,
    VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM = VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT,
-    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_NV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_PROPERTIES_KHR,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_PROTECTED_ACCESS_FEATURES,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES,
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES,
@@ -7015,7 +6982,6 @@ static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLUSTER_CULLING_SHADER
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_OPTICAL_FLOW_BIT_NV = 0x20000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CONVERT_COOPERATIVE_VECTOR_MATRIX_BIT_NV = 0x100000000000ULL;
 static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DATA_GRAPH_BIT_ARM = 0x40000000000ULL;
-static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_INDIRECT_BIT_KHR = 0x400000000000ULL;

 typedef VkFlags64 VkAccessFlags2;

@@ -7196,7 +7162,6 @@ static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_OPTICAL_FLOW_IMAGE_BIT
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_OPTICAL_FLOW_VECTOR_BIT_NV = 0x20000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_OPTICAL_FLOW_COST_BIT_NV = 0x40000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TENSOR_DATA_GRAPH_BIT_ARM = 0x1000000000000ULL;
-static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COPY_IMAGE_INDIRECT_DST_BIT_KHR = 0x800000000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_QUANTIZATION_DELTA_MAP_BIT_KHR = 0x2000000000000ULL;
 static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_EMPHASIS_MAP_BIT_KHR = 0x4000000000000ULL;

@@ -7554,7 +7519,7 @@ typedef struct VkPhysicalDeviceSubgroupSizeControlProperties {

 typedef struct VkPipelineShaderStageRequiredSubgroupSizeCreateInfo {
    VkStructureType    sType;
-    const void*        pNext;
+    void*              pNext;
    uint32_t           requiredSubgroupSize;
 } VkPipelineShaderStageRequiredSubgroupSizeCreateInfo;

@@ -8118,9 +8083,6 @@ static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER
 static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT = 0x04000000ULL;
 static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT = 0x00800000ULL;
 static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_MICROMAP_STORAGE_BIT_EXT = 0x01000000ULL;
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_COMPRESSED_DATA_DGF1_BIT_AMDX = 0x200000000ULL;
-#endif
 static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_DATA_GRAPH_FOREIGN_DESCRIPTOR_BIT_ARM = 0x20000000ULL;
 static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_TILE_MEMORY_BIT_QCOM = 0x08000000ULL;
 static const VkBufferUsageFlagBits2 VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT = 0x80000000ULL;
@@ -8703,8 +8665,7 @@ typedef enum VkPresentModeKHR {
    VK_PRESENT_MODE_FIFO_RELAXED_KHR = 3,
    VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR = 1000111000,
    VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR = 1000111001,
-    VK_PRESENT_MODE_FIFO_LATEST_READY_KHR = 1000361000,
-    VK_PRESENT_MODE_FIFO_LATEST_READY_EXT = VK_PRESENT_MODE_FIFO_LATEST_READY_KHR,
+    VK_PRESENT_MODE_FIFO_LATEST_READY_EXT = 1000361000,
    VK_PRESENT_MODE_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkPresentModeKHR;

@@ -8830,10 +8791,9 @@ typedef enum VkSwapchainCreateFlagBitsKHR {
    VK_SWAPCHAIN_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = 0x00000001,
    VK_SWAPCHAIN_CREATE_PROTECTED_BIT_KHR = 0x00000002,
    VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR = 0x00000004,
+    VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_EXT = 0x00000008,
    VK_SWAPCHAIN_CREATE_PRESENT_ID_2_BIT_KHR = 0x00000040,
    VK_SWAPCHAIN_CREATE_PRESENT_WAIT_2_BIT_KHR = 0x00000080,
-    VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_KHR = 0x00000008,
-    VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_EXT = VK_SWAPCHAIN_CREATE_DEFERRED_MEMORY_ALLOCATION_BIT_KHR,
    VK_SWAPCHAIN_CREATE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkSwapchainCreateFlagBitsKHR;
 typedef VkFlags VkSwapchainCreateFlagsKHR;
@@ -9571,7 +9531,6 @@ typedef enum VkVideoEncodeH264CapabilityFlagBitsKHR {
    VK_VIDEO_ENCODE_H264_CAPABILITY_PER_PICTURE_TYPE_MIN_MAX_QP_BIT_KHR = 0x00000040,
    VK_VIDEO_ENCODE_H264_CAPABILITY_PER_SLICE_CONSTANT_QP_BIT_KHR = 0x00000080,
    VK_VIDEO_ENCODE_H264_CAPABILITY_GENERATE_PREFIX_NALU_BIT_KHR = 0x00000100,
-    VK_VIDEO_ENCODE_H264_CAPABILITY_B_PICTURE_INTRA_REFRESH_BIT_KHR = 0x00000400,
    VK_VIDEO_ENCODE_H264_CAPABILITY_MB_QP_DIFF_WRAPAROUND_BIT_KHR = 0x00000200,
    VK_VIDEO_ENCODE_H264_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkVideoEncodeH264CapabilityFlagBitsKHR;
@@ -9773,7 +9732,6 @@ typedef enum VkVideoEncodeH265CapabilityFlagBitsKHR {
    VK_VIDEO_ENCODE_H265_CAPABILITY_PER_SLICE_SEGMENT_CONSTANT_QP_BIT_KHR = 0x00000080,
    VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_TILES_PER_SLICE_SEGMENT_BIT_KHR = 0x00000100,
    VK_VIDEO_ENCODE_H265_CAPABILITY_MULTIPLE_SLICE_SEGMENTS_PER_TILE_BIT_KHR = 0x00000200,
-    VK_VIDEO_ENCODE_H265_CAPABILITY_B_PICTURE_INTRA_REFRESH_BIT_KHR = 0x00000800,
    VK_VIDEO_ENCODE_H265_CAPABILITY_CU_QP_DIFF_WRAPAROUND_BIT_KHR = 0x00000400,
    VK_VIDEO_ENCODE_H265_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkVideoEncodeH265CapabilityFlagBitsKHR;
@@ -11938,7 +11896,6 @@ typedef enum VkVideoEncodeTuningModeKHR {
 } VkVideoEncodeTuningModeKHR;

 typedef enum VkVideoEncodeFlagBitsKHR {
-    VK_VIDEO_ENCODE_INTRA_REFRESH_BIT_KHR = 0x00000004,
    VK_VIDEO_ENCODE_WITH_QUANTIZATION_DELTA_MAP_BIT_KHR = 0x00000001,
    VK_VIDEO_ENCODE_WITH_EMPHASIS_MAP_BIT_KHR = 0x00000002,
    VK_VIDEO_ENCODE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
@@ -12373,18 +12330,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdTraceRaysIndirect2KHR(
 #endif


-// VK_KHR_shader_untyped_pointers is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_shader_untyped_pointers 1
-#define VK_KHR_SHADER_UNTYPED_POINTERS_SPEC_VERSION 1
-#define VK_KHR_SHADER_UNTYPED_POINTERS_EXTENSION_NAME "VK_KHR_shader_untyped_pointers"
-typedef struct VkPhysicalDeviceShaderUntypedPointersFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           shaderUntypedPointers;
-} VkPhysicalDeviceShaderUntypedPointersFeaturesKHR;
-
-
-
 // VK_KHR_portability_enumeration is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_portability_enumeration 1
 #define VK_KHR_PORTABILITY_ENUMERATION_SPEC_VERSION 1
@@ -12723,115 +12668,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkReleaseCapturedPipelineDataKHR(
 #endif


-// VK_KHR_surface_maintenance1 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_surface_maintenance1 1
-#define VK_KHR_SURFACE_MAINTENANCE_1_SPEC_VERSION 1
-#define VK_KHR_SURFACE_MAINTENANCE_1_EXTENSION_NAME "VK_KHR_surface_maintenance1"
-
-typedef enum VkPresentScalingFlagBitsKHR {
-    VK_PRESENT_SCALING_ONE_TO_ONE_BIT_KHR = 0x00000001,
-    VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_KHR = 0x00000002,
-    VK_PRESENT_SCALING_STRETCH_BIT_KHR = 0x00000004,
-    VK_PRESENT_SCALING_ONE_TO_ONE_BIT_EXT = VK_PRESENT_SCALING_ONE_TO_ONE_BIT_KHR,
-    VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_EXT = VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_KHR,
-    VK_PRESENT_SCALING_STRETCH_BIT_EXT = VK_PRESENT_SCALING_STRETCH_BIT_KHR,
-    VK_PRESENT_SCALING_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkPresentScalingFlagBitsKHR;
-typedef VkFlags VkPresentScalingFlagsKHR;
-
-typedef enum VkPresentGravityFlagBitsKHR {
-    VK_PRESENT_GRAVITY_MIN_BIT_KHR = 0x00000001,
-    VK_PRESENT_GRAVITY_MAX_BIT_KHR = 0x00000002,
-    VK_PRESENT_GRAVITY_CENTERED_BIT_KHR = 0x00000004,
-    VK_PRESENT_GRAVITY_MIN_BIT_EXT = VK_PRESENT_GRAVITY_MIN_BIT_KHR,
-    VK_PRESENT_GRAVITY_MAX_BIT_EXT = VK_PRESENT_GRAVITY_MAX_BIT_KHR,
-    VK_PRESENT_GRAVITY_CENTERED_BIT_EXT = VK_PRESENT_GRAVITY_CENTERED_BIT_KHR,
-    VK_PRESENT_GRAVITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkPresentGravityFlagBitsKHR;
-typedef VkFlags VkPresentGravityFlagsKHR;
-typedef struct VkSurfacePresentModeKHR {
-    VkStructureType     sType;
-    void*               pNext;
-    VkPresentModeKHR    presentMode;
-} VkSurfacePresentModeKHR;
-
-typedef struct VkSurfacePresentScalingCapabilitiesKHR {
-    VkStructureType             sType;
-    void*                       pNext;
-    VkPresentScalingFlagsKHR    supportedPresentScaling;
-    VkPresentGravityFlagsKHR    supportedPresentGravityX;
-    VkPresentGravityFlagsKHR    supportedPresentGravityY;
-    VkExtent2D                  minScaledImageExtent;
-    VkExtent2D                  maxScaledImageExtent;
-} VkSurfacePresentScalingCapabilitiesKHR;
-
-typedef struct VkSurfacePresentModeCompatibilityKHR {
-    VkStructureType      sType;
-    void*                pNext;
-    uint32_t             presentModeCount;
-    VkPresentModeKHR*    pPresentModes;
-} VkSurfacePresentModeCompatibilityKHR;
-
-
-
-// VK_KHR_swapchain_maintenance1 is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_swapchain_maintenance1 1
-#define VK_KHR_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION 1
-#define VK_KHR_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME "VK_KHR_swapchain_maintenance1"
-typedef struct VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           swapchainMaintenance1;
-} VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR;
-
-typedef struct VkSwapchainPresentFenceInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           swapchainCount;
-    const VkFence*     pFences;
-} VkSwapchainPresentFenceInfoKHR;
-
-typedef struct VkSwapchainPresentModesCreateInfoKHR {
-    VkStructureType            sType;
-    const void*                pNext;
-    uint32_t                   presentModeCount;
-    const VkPresentModeKHR*    pPresentModes;
-} VkSwapchainPresentModesCreateInfoKHR;
-
-typedef struct VkSwapchainPresentModeInfoKHR {
-    VkStructureType            sType;
-    const void*                pNext;
-    uint32_t                   swapchainCount;
-    const VkPresentModeKHR*    pPresentModes;
-} VkSwapchainPresentModeInfoKHR;
-
-typedef struct VkSwapchainPresentScalingCreateInfoKHR {
-    VkStructureType             sType;
-    const void*                 pNext;
-    VkPresentScalingFlagsKHR    scalingBehavior;
-    VkPresentGravityFlagsKHR    presentGravityX;
-    VkPresentGravityFlagsKHR    presentGravityY;
-} VkSwapchainPresentScalingCreateInfoKHR;
-
-typedef struct VkReleaseSwapchainImagesInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkSwapchainKHR     swapchain;
-    uint32_t           imageIndexCount;
-    const uint32_t*    pImageIndices;
-} VkReleaseSwapchainImagesInfoKHR;
-
-typedef VkResult (VKAPI_PTR *PFN_vkReleaseSwapchainImagesKHR)(VkDevice device, const VkReleaseSwapchainImagesInfoKHR* pReleaseInfo);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkReleaseSwapchainImagesKHR(
-    VkDevice                                    device,
-    const VkReleaseSwapchainImagesInfoKHR*      pReleaseInfo);
-#endif
-#endif
-
-
 // VK_KHR_cooperative_matrix is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_cooperative_matrix 1
 #define VK_KHR_COOPERATIVE_MATRIX_SPEC_VERSION 2
@@ -13011,7 +12847,6 @@ typedef enum VkVideoEncodeAV1CapabilityFlagBitsKHR {
    VK_VIDEO_ENCODE_AV1_CAPABILITY_PRIMARY_REFERENCE_CDF_ONLY_BIT_KHR = 0x00000004,
    VK_VIDEO_ENCODE_AV1_CAPABILITY_FRAME_SIZE_OVERRIDE_BIT_KHR = 0x00000008,
    VK_VIDEO_ENCODE_AV1_CAPABILITY_MOTION_VECTOR_SCALING_BIT_KHR = 0x00000010,
-    VK_VIDEO_ENCODE_AV1_CAPABILITY_COMPOUND_PREDICTION_INTRA_REFRESH_BIT_KHR = 0x00000020,
    VK_VIDEO_ENCODE_AV1_CAPABILITY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
 } VkVideoEncodeAV1CapabilityFlagBitsKHR;
 typedef VkFlags VkVideoEncodeAV1CapabilityFlagsKHR;
@@ -13450,141 +13285,6 @@ VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorBufferEmbeddedSamplers2EXT(
 #endif


-// VK_KHR_copy_memory_indirect is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_copy_memory_indirect 1
-#define VK_KHR_COPY_MEMORY_INDIRECT_SPEC_VERSION 1
-#define VK_KHR_COPY_MEMORY_INDIRECT_EXTENSION_NAME "VK_KHR_copy_memory_indirect"
-
-typedef enum VkAddressCopyFlagBitsKHR {
-    VK_ADDRESS_COPY_DEVICE_LOCAL_BIT_KHR = 0x00000001,
-    VK_ADDRESS_COPY_SPARSE_BIT_KHR = 0x00000002,
-    VK_ADDRESS_COPY_PROTECTED_BIT_KHR = 0x00000004,
-    VK_ADDRESS_COPY_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkAddressCopyFlagBitsKHR;
-typedef VkFlags VkAddressCopyFlagsKHR;
-typedef struct VkStridedDeviceAddressRangeKHR {
-    VkDeviceAddress    address;
-    VkDeviceSize       size;
-    VkDeviceSize       stride;
-} VkStridedDeviceAddressRangeKHR;
-
-typedef struct VkCopyMemoryIndirectCommandKHR {
-    VkDeviceAddress    srcAddress;
-    VkDeviceAddress    dstAddress;
-    VkDeviceSize       size;
-} VkCopyMemoryIndirectCommandKHR;
-
-typedef struct VkCopyMemoryIndirectInfoKHR {
-    VkStructureType                   sType;
-    const void*                       pNext;
-    VkAddressCopyFlagsKHR             srcCopyFlags;
-    VkAddressCopyFlagsKHR             dstCopyFlags;
-    uint32_t                          copyCount;
-    VkStridedDeviceAddressRangeKHR    copyAddressRange;
-} VkCopyMemoryIndirectInfoKHR;
-
-typedef struct VkCopyMemoryToImageIndirectCommandKHR {
-    VkDeviceAddress             srcAddress;
-    uint32_t                    bufferRowLength;
-    uint32_t                    bufferImageHeight;
-    VkImageSubresourceLayers    imageSubresource;
-    VkOffset3D                  imageOffset;
-    VkExtent3D                  imageExtent;
-} VkCopyMemoryToImageIndirectCommandKHR;
-
-typedef struct VkCopyMemoryToImageIndirectInfoKHR {
-    VkStructureType                    sType;
-    const void*                        pNext;
-    VkAddressCopyFlagsKHR              srcCopyFlags;
-    uint32_t                           copyCount;
-    VkStridedDeviceAddressRangeKHR     copyAddressRange;
-    VkImage                            dstImage;
-    VkImageLayout                      dstImageLayout;
-    const VkImageSubresourceLayers*    pImageSubresources;
-} VkCopyMemoryToImageIndirectInfoKHR;
-
-typedef struct VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           indirectMemoryCopy;
-    VkBool32           indirectMemoryToImageCopy;
-} VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR;
-
-typedef struct VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkQueueFlags       supportedQueues;
-} VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR;
-
-typedef void (VKAPI_PTR *PFN_vkCmdCopyMemoryIndirectKHR)(VkCommandBuffer commandBuffer, const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo);
-typedef void (VKAPI_PTR *PFN_vkCmdCopyMemoryToImageIndirectKHR)(VkCommandBuffer commandBuffer, const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo);
-
-#ifndef VK_NO_PROTOTYPES
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdCopyMemoryIndirectKHR(
-    VkCommandBuffer                             commandBuffer,
-    const VkCopyMemoryIndirectInfoKHR*          pCopyMemoryIndirectInfo);
-#endif
-
-#ifndef VK_ONLY_EXPORTED_PROTOTYPES
-VKAPI_ATTR void VKAPI_CALL vkCmdCopyMemoryToImageIndirectKHR(
-    VkCommandBuffer                             commandBuffer,
-    const VkCopyMemoryToImageIndirectInfoKHR*   pCopyMemoryToImageIndirectInfo);
-#endif
-#endif
-
-
-// VK_KHR_video_encode_intra_refresh is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_video_encode_intra_refresh 1
-#define VK_KHR_VIDEO_ENCODE_INTRA_REFRESH_SPEC_VERSION 1
-#define VK_KHR_VIDEO_ENCODE_INTRA_REFRESH_EXTENSION_NAME "VK_KHR_video_encode_intra_refresh"
-
-typedef enum VkVideoEncodeIntraRefreshModeFlagBitsKHR {
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_NONE_KHR = 0,
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_PER_PICTURE_PARTITION_BIT_KHR = 0x00000001,
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_BASED_BIT_KHR = 0x00000002,
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_ROW_BASED_BIT_KHR = 0x00000004,
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_BLOCK_COLUMN_BASED_BIT_KHR = 0x00000008,
-    VK_VIDEO_ENCODE_INTRA_REFRESH_MODE_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
-} VkVideoEncodeIntraRefreshModeFlagBitsKHR;
-typedef VkFlags VkVideoEncodeIntraRefreshModeFlagsKHR;
-typedef struct VkVideoEncodeIntraRefreshCapabilitiesKHR {
-    VkStructureType                          sType;
-    void*                                    pNext;
-    VkVideoEncodeIntraRefreshModeFlagsKHR    intraRefreshModes;
-    uint32_t                                 maxIntraRefreshCycleDuration;
-    uint32_t                                 maxIntraRefreshActiveReferencePictures;
-    VkBool32                                 partitionIndependentIntraRefreshRegions;
-    VkBool32                                 nonRectangularIntraRefreshRegions;
-} VkVideoEncodeIntraRefreshCapabilitiesKHR;
-
-typedef struct VkVideoEncodeSessionIntraRefreshCreateInfoKHR {
-    VkStructureType                             sType;
-    const void*                                 pNext;
-    VkVideoEncodeIntraRefreshModeFlagBitsKHR    intraRefreshMode;
-} VkVideoEncodeSessionIntraRefreshCreateInfoKHR;
-
-typedef struct VkVideoEncodeIntraRefreshInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           intraRefreshCycleDuration;
-    uint32_t           intraRefreshIndex;
-} VkVideoEncodeIntraRefreshInfoKHR;
-
-typedef struct VkVideoReferenceIntraRefreshInfoKHR {
-    VkStructureType    sType;
-    const void*        pNext;
-    uint32_t           dirtyIntraRefreshRegions;
-} VkVideoReferenceIntraRefreshInfoKHR;
-
-typedef struct VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           videoEncodeIntraRefresh;
-} VkPhysicalDeviceVideoEncodeIntraRefreshFeaturesKHR;
-
-
-
 // VK_KHR_video_encode_quantization_map is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_video_encode_quantization_map 1
 #define VK_KHR_VIDEO_ENCODE_QUANTIZATION_MAP_SPEC_VERSION 2
@@ -13733,32 +13433,18 @@ typedef VkFlags64 VkAccessFlags3KHR;
 typedef VkFlags64 VkAccessFlagBits3KHR;
 static const VkAccessFlagBits3KHR VK_ACCESS_3_NONE_KHR = 0ULL;

-typedef struct VkMemoryBarrierAccessFlags3KHR {
-    VkStructureType      sType;
-    const void*          pNext;
-    VkAccessFlags3KHR    srcAccessMask3;
-    VkAccessFlags3KHR    dstAccessMask3;
-} VkMemoryBarrierAccessFlags3KHR;
-
 typedef struct VkPhysicalDeviceMaintenance8FeaturesKHR {
    VkStructureType    sType;
    void*              pNext;
    VkBool32           maintenance8;
 } VkPhysicalDeviceMaintenance8FeaturesKHR;

-
-
-// VK_KHR_shader_fma is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_shader_fma 1
-#define VK_KHR_SHADER_FMA_SPEC_VERSION    1
-#define VK_KHR_SHADER_FMA_EXTENSION_NAME  "VK_KHR_shader_fma"
-typedef struct VkPhysicalDeviceShaderFmaFeaturesKHR {
+typedef struct VkMemoryBarrierAccessFlags3KHR {
    VkStructureType      sType;
-    void*              pNext;
-    VkBool32           shaderFmaFloat16;
-    VkBool32           shaderFmaFloat32;
-    VkBool32           shaderFmaFloat64;
-} VkPhysicalDeviceShaderFmaFeaturesKHR;
+    const void*          pNext;
+    VkAccessFlags3KHR    srcAccessMask3;
+    VkAccessFlags3KHR    dstAccessMask3;
+} VkMemoryBarrierAccessFlags3KHR;



@@ -13859,18 +13545,6 @@ typedef struct VkPhysicalDeviceRobustness2PropertiesKHR {



-// VK_KHR_present_mode_fifo_latest_ready is a preprocessor guard. Do not pass it to API calls.
-#define VK_KHR_present_mode_fifo_latest_ready 1
-#define VK_KHR_PRESENT_MODE_FIFO_LATEST_READY_SPEC_VERSION 1
-#define VK_KHR_PRESENT_MODE_FIFO_LATEST_READY_EXTENSION_NAME "VK_KHR_present_mode_fifo_latest_ready"
-typedef struct VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           presentModeFifoLatestReady;
-} VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR;
-
-
-
 // VK_EXT_debug_report is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_debug_report 1
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)
@@ -15859,9 +15533,6 @@ typedef enum VkGeometryTypeKHR {
    VK_GEOMETRY_TYPE_INSTANCES_KHR = 2,
    VK_GEOMETRY_TYPE_SPHERES_NV = 1000429004,
    VK_GEOMETRY_TYPE_LINEAR_SWEPT_SPHERES_NV = 1000429005,
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-    VK_GEOMETRY_TYPE_DENSE_GEOMETRY_FORMAT_TRIANGLES_AMDX = 1000478000,
-#endif
    VK_GEOMETRY_TYPE_TRIANGLES_NV = VK_GEOMETRY_TYPE_TRIANGLES_KHR,
    VK_GEOMETRY_TYPE_AABBS_NV = VK_GEOMETRY_TYPE_AABBS_KHR,
    VK_GEOMETRY_TYPE_MAX_ENUM_KHR = 0x7FFFFFFF
@@ -15950,7 +15621,6 @@ typedef enum VkBuildAccelerationStructureFlagBitsKHR {
    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DISPLACEMENT_MICROMAP_UPDATE_BIT_NV = 0x00000200,
 #endif
    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_DATA_ACCESS_BIT_KHR = 0x00000800,
-    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_CLUSTER_OPACITY_MICROMAPS_BIT_NV = 0x00001000,
    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_UPDATE_BIT_NV = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_UPDATE_BIT_KHR,
    VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_COMPACTION_BIT_NV = VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_COMPACTION_BIT_KHR,
    VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_TRACE_BIT_NV = VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_TRACE_BIT_KHR,
@@ -17649,19 +17319,44 @@ typedef struct VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT {
 #define VK_EXT_surface_maintenance1 1
 #define VK_EXT_SURFACE_MAINTENANCE_1_SPEC_VERSION 1
 #define VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME "VK_EXT_surface_maintenance1"
-typedef VkPresentScalingFlagBitsKHR VkPresentScalingFlagBitsEXT;

-typedef VkPresentScalingFlagsKHR VkPresentScalingFlagsEXT;
+typedef enum VkPresentScalingFlagBitsEXT {
+    VK_PRESENT_SCALING_ONE_TO_ONE_BIT_EXT = 0x00000001,
+    VK_PRESENT_SCALING_ASPECT_RATIO_STRETCH_BIT_EXT = 0x00000002,
+    VK_PRESENT_SCALING_STRETCH_BIT_EXT = 0x00000004,
+    VK_PRESENT_SCALING_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
+} VkPresentScalingFlagBitsEXT;
+typedef VkFlags VkPresentScalingFlagsEXT;

-typedef VkPresentGravityFlagBitsKHR VkPresentGravityFlagBitsEXT;
+typedef enum VkPresentGravityFlagBitsEXT {
+    VK_PRESENT_GRAVITY_MIN_BIT_EXT = 0x00000001,
+    VK_PRESENT_GRAVITY_MAX_BIT_EXT = 0x00000002,
+    VK_PRESENT_GRAVITY_CENTERED_BIT_EXT = 0x00000004,
+    VK_PRESENT_GRAVITY_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
+} VkPresentGravityFlagBitsEXT;
+typedef VkFlags VkPresentGravityFlagsEXT;
+typedef struct VkSurfacePresentModeEXT {
+    VkStructureType     sType;
+    void*               pNext;
+    VkPresentModeKHR    presentMode;
+} VkSurfacePresentModeEXT;

-typedef VkPresentGravityFlagsKHR VkPresentGravityFlagsEXT;
+typedef struct VkSurfacePresentScalingCapabilitiesEXT {
+    VkStructureType             sType;
+    void*                       pNext;
+    VkPresentScalingFlagsEXT    supportedPresentScaling;
+    VkPresentGravityFlagsEXT    supportedPresentGravityX;
+    VkPresentGravityFlagsEXT    supportedPresentGravityY;
+    VkExtent2D                  minScaledImageExtent;
+    VkExtent2D                  maxScaledImageExtent;
+} VkSurfacePresentScalingCapabilitiesEXT;

-typedef VkSurfacePresentModeKHR VkSurfacePresentModeEXT;
-
-typedef VkSurfacePresentScalingCapabilitiesKHR VkSurfacePresentScalingCapabilitiesEXT;
-
-typedef VkSurfacePresentModeCompatibilityKHR VkSurfacePresentModeCompatibilityEXT;
+typedef struct VkSurfacePresentModeCompatibilityEXT {
+    VkStructureType      sType;
+    void*                pNext;
+    uint32_t             presentModeCount;
+    VkPresentModeKHR*    pPresentModes;
+} VkSurfacePresentModeCompatibilityEXT;



@@ -17669,25 +17364,56 @@ typedef VkSurfacePresentModeCompatibilityKHR VkSurfacePresentModeCompatibilityEX
 #define VK_EXT_swapchain_maintenance1 1
 #define VK_EXT_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION 1
 #define VK_EXT_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME "VK_EXT_swapchain_maintenance1"
-typedef VkPhysicalDeviceSwapchainMaintenance1FeaturesKHR VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT;
+typedef struct VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           swapchainMaintenance1;
+} VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT;

-typedef VkSwapchainPresentFenceInfoKHR VkSwapchainPresentFenceInfoEXT;
+typedef struct VkSwapchainPresentFenceInfoEXT {
+    VkStructureType    sType;
+    const void*        pNext;
+    uint32_t           swapchainCount;
+    const VkFence*     pFences;
+} VkSwapchainPresentFenceInfoEXT;

-typedef VkSwapchainPresentModesCreateInfoKHR VkSwapchainPresentModesCreateInfoEXT;
+typedef struct VkSwapchainPresentModesCreateInfoEXT {
+    VkStructureType            sType;
+    const void*                pNext;
+    uint32_t                   presentModeCount;
+    const VkPresentModeKHR*    pPresentModes;
+} VkSwapchainPresentModesCreateInfoEXT;

-typedef VkSwapchainPresentModeInfoKHR VkSwapchainPresentModeInfoEXT;
+typedef struct VkSwapchainPresentModeInfoEXT {
+    VkStructureType            sType;
+    const void*                pNext;
+    uint32_t                   swapchainCount;
+    const VkPresentModeKHR*    pPresentModes;
+} VkSwapchainPresentModeInfoEXT;

-typedef VkSwapchainPresentScalingCreateInfoKHR VkSwapchainPresentScalingCreateInfoEXT;
+typedef struct VkSwapchainPresentScalingCreateInfoEXT {
+    VkStructureType             sType;
+    const void*                 pNext;
+    VkPresentScalingFlagsEXT    scalingBehavior;
+    VkPresentGravityFlagsEXT    presentGravityX;
+    VkPresentGravityFlagsEXT    presentGravityY;
+} VkSwapchainPresentScalingCreateInfoEXT;

-typedef VkReleaseSwapchainImagesInfoKHR VkReleaseSwapchainImagesInfoEXT;
+typedef struct VkReleaseSwapchainImagesInfoEXT {
+    VkStructureType    sType;
+    const void*        pNext;
+    VkSwapchainKHR     swapchain;
+    uint32_t           imageIndexCount;
+    const uint32_t*    pImageIndices;
+} VkReleaseSwapchainImagesInfoEXT;

-typedef VkResult (VKAPI_PTR *PFN_vkReleaseSwapchainImagesEXT)(VkDevice device, const VkReleaseSwapchainImagesInfoKHR* pReleaseInfo);
+typedef VkResult (VKAPI_PTR *PFN_vkReleaseSwapchainImagesEXT)(VkDevice device, const VkReleaseSwapchainImagesInfoEXT* pReleaseInfo);

 #ifndef VK_NO_PROTOTYPES
 #ifndef VK_ONLY_EXPORTED_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkReleaseSwapchainImagesEXT(
    VkDevice                                    device,
-    const VkReleaseSwapchainImagesInfoKHR*      pReleaseInfo);
+    const VkReleaseSwapchainImagesInfoEXT*      pReleaseInfo);
 #endif
 #endif

@@ -17942,17 +17668,17 @@ typedef VkPhysicalDeviceTexelBufferAlignmentProperties VkPhysicalDeviceTexelBuff

 // VK_QCOM_render_pass_transform is a preprocessor guard. Do not pass it to API calls.
 #define VK_QCOM_render_pass_transform 1
-#define VK_QCOM_RENDER_PASS_TRANSFORM_SPEC_VERSION 5
+#define VK_QCOM_RENDER_PASS_TRANSFORM_SPEC_VERSION 4
 #define VK_QCOM_RENDER_PASS_TRANSFORM_EXTENSION_NAME "VK_QCOM_render_pass_transform"
 typedef struct VkRenderPassTransformBeginInfoQCOM {
    VkStructureType                  sType;
-    const void*                      pNext;
+    void*                            pNext;
    VkSurfaceTransformFlagBitsKHR    transform;
 } VkRenderPassTransformBeginInfoQCOM;

 typedef struct VkCommandBufferInheritanceRenderPassTransformInfoQCOM {
    VkStructureType                  sType;
-    const void*                      pNext;
+    void*                            pNext;
    VkSurfaceTransformFlagBitsKHR    transform;
    VkRect2D                         renderArea;
 } VkCommandBufferInheritanceRenderPassTransformInfoQCOM;
@@ -18240,7 +17966,7 @@ typedef struct VkDeviceDiagnosticsConfigCreateInfoNV {

 // VK_QCOM_tile_shading is a preprocessor guard. Do not pass it to API calls.
 #define VK_QCOM_tile_shading 1
-#define VK_QCOM_TILE_SHADING_SPEC_VERSION 2
+#define VK_QCOM_TILE_SHADING_SPEC_VERSION 1
 #define VK_QCOM_TILE_SHADING_EXTENSION_NAME "VK_QCOM_tile_shading"

 typedef enum VkTileShadingRenderPassFlagBitsQCOM {
@@ -19179,7 +18905,11 @@ typedef struct VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT {
 #define VK_EXT_present_mode_fifo_latest_ready 1
 #define VK_EXT_PRESENT_MODE_FIFO_LATEST_READY_SPEC_VERSION 1
 #define VK_EXT_PRESENT_MODE_FIFO_LATEST_READY_EXTENSION_NAME "VK_EXT_present_mode_fifo_latest_ready"
-typedef VkPhysicalDevicePresentModeFifoLatestReadyFeaturesKHR VkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT;
+typedef struct VkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           presentModeFifoLatestReady;
+} VkPhysicalDevicePresentModeFifoLatestReadyFeaturesEXT;



@@ -19468,66 +19198,6 @@ typedef VkQueueFamilyGlobalPriorityProperties VkQueueFamilyGlobalPriorityPropert



-// VK_VALVE_video_encode_rgb_conversion is a preprocessor guard. Do not pass it to API calls.
-#define VK_VALVE_video_encode_rgb_conversion 1
-#define VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_SPEC_VERSION 1
-#define VK_VALVE_VIDEO_ENCODE_RGB_CONVERSION_EXTENSION_NAME "VK_VALVE_video_encode_rgb_conversion"
-
-typedef enum VkVideoEncodeRgbModelConversionFlagBitsVALVE {
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_RGB_IDENTITY_BIT_VALVE = 0x00000001,
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_IDENTITY_BIT_VALVE = 0x00000002,
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_709_BIT_VALVE = 0x00000004,
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_601_BIT_VALVE = 0x00000008,
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_YCBCR_2020_BIT_VALVE = 0x00000010,
-    VK_VIDEO_ENCODE_RGB_MODEL_CONVERSION_FLAG_BITS_MAX_ENUM_VALVE = 0x7FFFFFFF
-} VkVideoEncodeRgbModelConversionFlagBitsVALVE;
-typedef VkFlags VkVideoEncodeRgbModelConversionFlagsVALVE;
-
-typedef enum VkVideoEncodeRgbRangeCompressionFlagBitsVALVE {
-    VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_FULL_RANGE_BIT_VALVE = 0x00000001,
-    VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_NARROW_RANGE_BIT_VALVE = 0x00000002,
-    VK_VIDEO_ENCODE_RGB_RANGE_COMPRESSION_FLAG_BITS_MAX_ENUM_VALVE = 0x7FFFFFFF
-} VkVideoEncodeRgbRangeCompressionFlagBitsVALVE;
-typedef VkFlags VkVideoEncodeRgbRangeCompressionFlagsVALVE;
-
-typedef enum VkVideoEncodeRgbChromaOffsetFlagBitsVALVE {
-    VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_COSITED_EVEN_BIT_VALVE = 0x00000001,
-    VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_MIDPOINT_BIT_VALVE = 0x00000002,
-    VK_VIDEO_ENCODE_RGB_CHROMA_OFFSET_FLAG_BITS_MAX_ENUM_VALVE = 0x7FFFFFFF
-} VkVideoEncodeRgbChromaOffsetFlagBitsVALVE;
-typedef VkFlags VkVideoEncodeRgbChromaOffsetFlagsVALVE;
-typedef struct VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           videoEncodeRgbConversion;
-} VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE;
-
-typedef struct VkVideoEncodeRgbConversionCapabilitiesVALVE {
-    VkStructureType                               sType;
-    void*                                         pNext;
-    VkVideoEncodeRgbModelConversionFlagsVALVE     rgbModels;
-    VkVideoEncodeRgbRangeCompressionFlagsVALVE    rgbRanges;
-    VkVideoEncodeRgbChromaOffsetFlagsVALVE        xChromaOffsets;
-    VkVideoEncodeRgbChromaOffsetFlagsVALVE        yChromaOffsets;
-} VkVideoEncodeRgbConversionCapabilitiesVALVE;
-
-typedef struct VkVideoEncodeProfileRgbConversionInfoVALVE {
-    VkStructureType    sType;
-    const void*        pNext;
-    VkBool32           performEncodeRgbConversion;
-} VkVideoEncodeProfileRgbConversionInfoVALVE;
-
-typedef struct VkVideoEncodeSessionRgbConversionCreateInfoVALVE {
-    VkStructureType                                  sType;
-    const void*                                      pNext;
-    VkVideoEncodeRgbModelConversionFlagBitsVALVE     rgbModel;
-    VkVideoEncodeRgbRangeCompressionFlagBitsVALVE    rgbRange;
-    VkVideoEncodeRgbChromaOffsetFlagBitsVALVE        xChromaOffset;
-    VkVideoEncodeRgbChromaOffsetFlagBitsVALVE        yChromaOffset;
-} VkVideoEncodeSessionRgbConversionCreateInfoVALVE;
-
-
-
 // VK_EXT_image_view_min_lod is a preprocessor guard. Do not pass it to API calls.
 #define VK_EXT_image_view_min_lod 1
 #define VK_EXT_IMAGE_VIEW_MIN_LOD_SPEC_VERSION 1
@@ -20233,9 +19903,20 @@ typedef VkRenderPassFragmentDensityMapOffsetEndInfoEXT VkSubpassFragmentDensityM
 #define VK_NV_copy_memory_indirect 1
 #define VK_NV_COPY_MEMORY_INDIRECT_SPEC_VERSION 1
 #define VK_NV_COPY_MEMORY_INDIRECT_EXTENSION_NAME "VK_NV_copy_memory_indirect"
-typedef VkCopyMemoryIndirectCommandKHR VkCopyMemoryIndirectCommandNV;
+typedef struct VkCopyMemoryIndirectCommandNV {
+    VkDeviceAddress    srcAddress;
+    VkDeviceAddress    dstAddress;
+    VkDeviceSize       size;
+} VkCopyMemoryIndirectCommandNV;

-typedef VkCopyMemoryToImageIndirectCommandKHR VkCopyMemoryToImageIndirectCommandNV;
+typedef struct VkCopyMemoryToImageIndirectCommandNV {
+    VkDeviceAddress             srcAddress;
+    uint32_t                    bufferRowLength;
+    uint32_t                    bufferImageHeight;
+    VkImageSubresourceLayers    imageSubresource;
+    VkOffset3D                  imageOffset;
+    VkExtent3D                  imageExtent;
+} VkCopyMemoryToImageIndirectCommandNV;

 typedef struct VkPhysicalDeviceCopyMemoryIndirectFeaturesNV {
    VkStructureType    sType;
@@ -20243,7 +19924,11 @@ typedef struct VkPhysicalDeviceCopyMemoryIndirectFeaturesNV {
    VkBool32           indirectCopy;
 } VkPhysicalDeviceCopyMemoryIndirectFeaturesNV;

-typedef VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR VkPhysicalDeviceCopyMemoryIndirectPropertiesNV;
+typedef struct VkPhysicalDeviceCopyMemoryIndirectPropertiesNV {
+    VkStructureType    sType;
+    void*              pNext;
+    VkQueueFlags       supportedQueues;
+} VkPhysicalDeviceCopyMemoryIndirectPropertiesNV;

 typedef void (VKAPI_PTR *PFN_vkCmdCopyMemoryIndirectNV)(VkCommandBuffer commandBuffer, VkDeviceAddress copyBufferAddress, uint32_t copyCount, uint32_t stride);
 typedef void (VKAPI_PTR *PFN_vkCmdCopyMemoryToImageIndirectNV)(VkCommandBuffer commandBuffer, VkDeviceAddress copyBufferAddress, uint32_t copyCount, uint32_t stride, VkImage dstImage, VkImageLayout dstImageLayout, const VkImageSubresourceLayers* pImageSubresources);
@@ -22784,7 +22469,7 @@ typedef struct VkPhysicalDeviceRayTracingValidationFeaturesNV {

 // VK_NV_cluster_acceleration_structure is a preprocessor guard. Do not pass it to API calls.
 #define VK_NV_cluster_acceleration_structure 1
-#define VK_NV_CLUSTER_ACCELERATION_STRUCTURE_SPEC_VERSION 4
+#define VK_NV_CLUSTER_ACCELERATION_STRUCTURE_SPEC_VERSION 3
 #define VK_NV_CLUSTER_ACCELERATION_STRUCTURE_EXTENSION_NAME "VK_NV_cluster_acceleration_structure"

 typedef enum VkClusterAccelerationStructureTypeNV {
@@ -23671,18 +23356,6 @@ typedef struct VkPhysicalDeviceZeroInitializeDeviceMemoryFeaturesEXT {



-// VK_SEC_pipeline_cache_incremental_mode is a preprocessor guard. Do not pass it to API calls.
-#define VK_SEC_pipeline_cache_incremental_mode 1
-#define VK_SEC_PIPELINE_CACHE_INCREMENTAL_MODE_SPEC_VERSION 1
-#define VK_SEC_PIPELINE_CACHE_INCREMENTAL_MODE_EXTENSION_NAME "VK_SEC_pipeline_cache_incremental_mode"
-typedef struct VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC {
-    VkStructureType    sType;
-    void*              pNext;
-    VkBool32           pipelineCacheIncrementalMode;
-} VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC;
-
-
-
 // VK_KHR_acceleration_structure is a preprocessor guard. Do not pass it to API calls.
 #define VK_KHR_acceleration_structure 1
 #define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13
@@ -5,6 +5,7 @@

 // This header is generated from the Khronos Vulkan XML API Registry.

+
 #ifndef VULKAN_HPP_MACROS_HPP
 #define VULKAN_HPP_MACROS_HPP

@@ -87,13 +88,12 @@
 #  define VULKAN_HPP_SUPPORT_SPAN
 #endif

-#if !defined( VULKAN_HPP_STD_MODULE ) && defined( __cpp_modules ) && defined( __cpp_lib_modules )
+#if defined( __cpp_lib_modules ) && !defined( VULKAN_HPP_STD_MODULE ) && defined( VULKAN_HPP_ENABLE_STD_MODULE )
 #  define VULKAN_HPP_STD_MODULE std.compat
 #endif

 #ifndef VK_USE_64_BIT_PTR_DEFINES
-#  if defined( __LP64__ ) || defined( _WIN64 ) || ( defined( __x86_64__ ) && !defined( __ILP32__ ) ) || defined( _M_X64 ) || defined( __ia64 ) || \
-    defined( _M_IA64 ) || defined( __aarch64__ ) || defined( __powerpc64__ ) || ( defined( __riscv ) && __riscv_xlen == 64 )
+    #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) || (defined(__riscv) && __riscv_xlen == 64)
        #define VK_USE_64_BIT_PTR_DEFINES 1
    #else
        #define VK_USE_64_BIT_PTR_DEFINES 0
@@ -158,11 +158,6 @@
 #  else
 #    define VULKAN_HPP_CONSTEXPR_14
 #  endif
-#  if 201603 <= __cpp_constexpr
-#    define VULKAN_HPP_CONSTEXPR_17 constexpr
-#  else
-#    define VULKAN_HPP_CONSTEXPR_17
-#  endif
 #  if ( 201907 <= __cpp_constexpr ) && ( !defined( __GNUC__ ) || ( 110400 < GCC_VERSION ) )
 #    define VULKAN_HPP_CONSTEXPR_20 constexpr
 #  else
@@ -274,21 +269,6 @@ namespace VULKAN_HPP_NAMESPACE
  }  // namespace detail
 }  // namespace VULKAN_HPP_NAMESPACE

-#if !defined( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC_TYPE )
-#  define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC_TYPE VULKAN_HPP_NAMESPACE::detail::DispatchLoaderDynamic
-#endif
-#if !defined( VULKAN_HPP_DISPATCH_LOADER_STATIC_TYPE )
-#  define VULKAN_HPP_DISPATCH_LOADER_STATIC_TYPE VULKAN_HPP_NAMESPACE::detail::DispatchLoaderStatic
-#endif
-
-#if !defined( VULKAN_HPP_DEFAULT_DISPATCHER_TYPE )
-#  if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
-#    define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC_TYPE
-#  else
-#    define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE VULKAN_HPP_DISPATCH_LOADER_STATIC_TYPE
-#  endif
-#endif
-
 #if !defined( VULKAN_HPP_DEFAULT_DISPATCHER )
 #  if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
 #    define VULKAN_HPP_DEFAULT_DISPATCHER ::VULKAN_HPP_NAMESPACE::detail::defaultDispatchLoaderDynamic
@@ -306,21 +286,42 @@ namespace VULKAN_HPP_NAMESPACE
 #  endif
 #endif

+#if !defined( VULKAN_HPP_DEFAULT_DISPATCHER_TYPE )
+#  if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
+#    define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE ::VULKAN_HPP_NAMESPACE::detail::DispatchLoaderDynamic
+#  else
+#    define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE ::VULKAN_HPP_NAMESPACE::detail::DispatchLoaderStatic
+#  endif
+#endif
+
 #if defined( VULKAN_HPP_NO_DEFAULT_DISPATCHER )
 #  define VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT
 #  define VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT
 #  define VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT
-#  define VULKAN_HPP_DEFAULT_ASSIGNMENT( assignment )
 #else
 #  define VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT         = {}
 #  define VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT = nullptr
 #  define VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT       = VULKAN_HPP_DEFAULT_DISPATCHER
-#  define VULKAN_HPP_DEFAULT_ASSIGNMENT( assignment )    = assignment
+#endif
+
+#if !defined( VULKAN_HPP_EXPECTED ) && ( 23 <= VULKAN_HPP_CPP_VERSION ) && defined( __cpp_lib_expected )
+#  if !( defined( VULKAN_HPP_ENABLE_STD_MODULE ) && defined( VULKAN_HPP_STD_MODULE ) )
+#    include <expected>
+#  endif
+#  define VULKAN_HPP_EXPECTED   std::expected
+#  define VULKAN_HPP_UNEXPECTED std::unexpected
 #endif

 #if !defined( VULKAN_HPP_RAII_NAMESPACE )
 #  define VULKAN_HPP_RAII_NAMESPACE raii
-#  define VULKAN_HPP_RAII_NAMESPACE_STRING VULKAN_HPP_STRINGIFY( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE )
 #endif

+#if defined( VULKAN_HPP_NO_EXCEPTIONS ) && defined( VULKAN_HPP_EXPECTED )
+#  define VULKAN_HPP_RAII_NO_EXCEPTIONS
+#  define VULKAN_HPP_RAII_CREATE_NOEXCEPT noexcept
+#else
+#  define VULKAN_HPP_RAII_CREATE_NOEXCEPT
+#endif
+
+
 #endif
@@ -25,12 +25,14 @@ typedef struct NativeWindow OHNativeWindow;
 #define VK_OHOS_SURFACE_SPEC_VERSION      1
 #define VK_OHOS_SURFACE_EXTENSION_NAME    "VK_OHOS_surface"
 typedef VkFlags VkSurfaceCreateFlagsOHOS;
-typedef struct VkSurfaceCreateInfoOHOS {
+typedef struct VkOHSurfaceCreateInfoOHOS {
    VkStructureType             sType;
    const void*                 pNext;
    VkSurfaceCreateFlagsOHOS    flags;
    OHNativeWindow*             window;
-} VkSurfaceCreateInfoOHOS;
+} VkOHSurfaceCreateInfoOHOS;
+
+typedef VkOHSurfaceCreateInfoOHOS VkSurfaceCreateInfoOHOS;

 typedef VkResult (VKAPI_PTR *PFN_vkCreateSurfaceOHOS)(VkInstance instance, const VkSurfaceCreateInfoOHOS* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);

@@ -10,13 +10,14 @@

 #include <vulkan/vulkan.hpp>

-#if !defined( VULKAN_HPP_CXX_MODULE )
+#if !( defined( VULKAN_HPP_ENABLE_STD_MODULE ) && defined( VULKAN_HPP_STD_MODULE ) )
 #include <atomic>  // std::atomic_size_t
 #endif

 namespace VULKAN_HPP_NAMESPACE
 {
 #if !defined( VULKAN_HPP_NO_SMART_HANDLE )
+  
 template <typename HandleType>
 class SharedHandleTraits;

@@ -84,7 +85,7 @@ namespace VULKAN_HPP_NAMESPACE
 template <typename DestructorType, typename Deleter>
 struct SharedHeader
 {
-    SharedHeader( SharedHandle<DestructorType> parent, Deleter deleter VULKAN_HPP_DEFAULT_ASSIGNMENT( Deleter() ) ) VULKAN_HPP_NOEXCEPT
+  SharedHeader( SharedHandle<DestructorType> parent, Deleter deleter = Deleter() ) VULKAN_HPP_NOEXCEPT
    : parent( std::move( parent ) )
    , deleter( std::move( deleter ) )
  {
@@ -97,7 +98,7 @@ namespace VULKAN_HPP_NAMESPACE
 template <typename Deleter>
 struct SharedHeader<NoDestructor, Deleter>
 {
-    SharedHeader( Deleter deleter VULKAN_HPP_DEFAULT_ASSIGNMENT( Deleter() ) ) VULKAN_HPP_NOEXCEPT : deleter( std::move( deleter ) ) {}
+  SharedHeader( Deleter deleter = Deleter() ) VULKAN_HPP_NOEXCEPT : deleter( std::move( deleter ) ) {}

  Deleter deleter;
 };
@@ -131,7 +132,7 @@ namespace VULKAN_HPP_NAMESPACE

 public:
  std::atomic_size_t m_ref_cnt{ 1 };
-    HeaderType         m_header;
+  HeaderType         m_header{};
 };

 //=====================================================================================================================
@@ -282,9 +283,7 @@ namespace VULKAN_HPP_NAMESPACE
  SharedHandle() = default;

  template <typename T = HandleType, typename = typename std::enable_if<HasDestructor<T>::value && !HasPoolType<T>::value>::type>
-    explicit SharedHandle( HandleType                                 handle,
-                           SharedHandle<DestructorTypeOf<HandleType>> parent,
-                           DeleterType deleter                        VULKAN_HPP_DEFAULT_ASSIGNMENT( DeleterType() ) ) VULKAN_HPP_NOEXCEPT
+  explicit SharedHandle( HandleType handle, SharedHandle<DestructorTypeOf<HandleType>> parent, DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT
    : BaseType( handle, std::move( parent ), std::move( deleter ) )
  {
  }
@@ -301,8 +300,7 @@ namespace VULKAN_HPP_NAMESPACE
  }

  template <typename T = HandleType, typename = typename std::enable_if<!HasDestructor<T>::value>::type>
-    explicit SharedHandle( HandleType handle, DeleterType deleter VULKAN_HPP_DEFAULT_ASSIGNMENT( DeleterType() ) ) VULKAN_HPP_NOEXCEPT
-      : BaseType( handle, std::move( deleter ) )
+  explicit SharedHandle( HandleType handle, DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT : BaseType( handle, std::move( deleter ) )
  {
  }

@@ -312,6 +310,7 @@ namespace VULKAN_HPP_NAMESPACE

  namespace detail
  {
+    
 // Silence the function cast warnings.
 #if defined( __GNUC__ ) && !defined( __clang__ ) && !defined( __INTEL_COMPILER )
 #  pragma GCC diagnostic push
@@ -328,8 +327,7 @@ namespace VULKAN_HPP_NAMESPACE
  using DestructorType = typename SharedHandleTraits<HandleType>::DestructorType;

  template <class Dispatcher>
-      using DestroyFunctionPointerType =
-        typename std::conditional<HasDestructor<HandleType>::value,
+  using DestroyFunctionPointerType = typename std::conditional<HasDestructor<HandleType>::value,
                                                               void ( DestructorType::* )( HandleType, const AllocationCallbacks *, const Dispatcher & ) const,
                                                               void ( HandleType::* )( const AllocationCallbacks *, const Dispatcher & ) const>::type;

@@ -466,12 +464,14 @@ namespace VULKAN_HPP_NAMESPACE
 #elif defined( __clang__ ) && (__clang_major__ >= 13) && !defined( __INTEL_COMPILER )
 #  pragma clang diagnostic pop
 #endif
-  }  // namespace detail
+
+  }
  
  //======================
  //=== SHARED HANDLEs ===
  //======================

+
  //=== VK_VERSION_1_0 ===
  template <>
  class SharedHandleTraits<Instance>
@@ -480,9 +480,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = NoDestructor;
    using deleter = detail::ObjectDestroyShared<Instance>;
  };
-
  using SharedInstance = SharedHandle<Instance>;
-
  template <>
  class SharedHandleTraits<Device>
  {
@@ -490,9 +488,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = NoDestructor;
    using deleter = detail::ObjectDestroyShared<Device>;
  };
-
  using SharedDevice = SharedHandle<Device>;
-
  template <>
  class SharedHandleTraits<DeviceMemory>
  {
@@ -500,9 +496,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectFreeShared<DeviceMemory>;
  };
-
  using SharedDeviceMemory = SharedHandle<DeviceMemory>;
-
  template <>
  class SharedHandleTraits<Fence>
  {
@@ -510,9 +504,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<Fence>;
  };
-
  using SharedFence = SharedHandle<Fence>;
-
  template <>
  class SharedHandleTraits<Semaphore>
  {
@@ -520,9 +512,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<Semaphore>;
  };
-
  using SharedSemaphore = SharedHandle<Semaphore>;
-
  template <>
  class SharedHandleTraits<Event>
  {
@@ -530,9 +520,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<Event>;
  };
-
  using SharedEvent = SharedHandle<Event>;
-
  template <>
  class SharedHandleTraits<QueryPool>
  {
@@ -540,9 +528,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<QueryPool>;
  };
-
  using SharedQueryPool = SharedHandle<QueryPool>;
-
  template <>
  class SharedHandleTraits<Buffer>
  {
@@ -550,9 +536,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<Buffer>;
  };
-
  using SharedBuffer = SharedHandle<Buffer>;
-
  template <>
  class SharedHandleTraits<BufferView>
  {
@@ -560,9 +544,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<BufferView>;
  };
-
  using SharedBufferView = SharedHandle<BufferView>;
-
  template <>
  class SharedHandleTraits<Image>
  {
@@ -570,9 +552,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<Image>;
  };
-
  using SharedImage = SharedHandle<Image>;
-
  template <>
  class SharedHandleTraits<ImageView>
  {
@@ -580,9 +560,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<ImageView>;
  };
-
  using SharedImageView = SharedHandle<ImageView>;
-
  template <>
  class SharedHandleTraits<ShaderModule>
  {
@@ -590,9 +568,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<ShaderModule>;
  };
-
  using SharedShaderModule = SharedHandle<ShaderModule>;
-
  template <>
  class SharedHandleTraits<PipelineCache>
  {
@@ -600,9 +576,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<PipelineCache>;
  };
-
  using SharedPipelineCache = SharedHandle<PipelineCache>;
-
  template <>
  class SharedHandleTraits<Pipeline>
  {
@@ -610,9 +584,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<Pipeline>;
  };
-
  using SharedPipeline = SharedHandle<Pipeline>;
-
  template <>
  class SharedHandleTraits<PipelineLayout>
  {
@@ -620,9 +592,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<PipelineLayout>;
  };
-
  using SharedPipelineLayout = SharedHandle<PipelineLayout>;
-
  template <>
  class SharedHandleTraits<Sampler>
  {
@@ -630,9 +600,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<Sampler>;
  };
-
  using SharedSampler = SharedHandle<Sampler>;
-
  template <>
  class SharedHandleTraits<DescriptorPool>
  {
@@ -640,9 +608,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<DescriptorPool>;
  };
-
  using SharedDescriptorPool = SharedHandle<DescriptorPool>;
-
  template <>
  class SharedHandleTraits<DescriptorSet>
  {
@@ -650,9 +616,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::PoolFreeShared<DescriptorSet, DescriptorPool>;
  };
-
  using SharedDescriptorSet = SharedHandle<DescriptorSet>;
-
  template <>
  class SharedHandleTraits<DescriptorSetLayout>
  {
@@ -660,9 +624,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<DescriptorSetLayout>;
  };
-
  using SharedDescriptorSetLayout = SharedHandle<DescriptorSetLayout>;
-
  template <>
  class SharedHandleTraits<Framebuffer>
  {
@@ -670,9 +632,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<Framebuffer>;
  };
-
  using SharedFramebuffer = SharedHandle<Framebuffer>;
-
  template <>
  class SharedHandleTraits<RenderPass>
  {
@@ -680,9 +640,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<RenderPass>;
  };
-
  using SharedRenderPass = SharedHandle<RenderPass>;
-
  template <>
  class SharedHandleTraits<CommandPool>
  {
@@ -690,9 +648,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<CommandPool>;
  };
-
  using SharedCommandPool = SharedHandle<CommandPool>;
-
  template <>
  class SharedHandleTraits<CommandBuffer>
  {
@@ -700,7 +656,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::PoolFreeShared<CommandBuffer, CommandPool>;
  };
-
  using SharedCommandBuffer = SharedHandle<CommandBuffer>;

  //=== VK_VERSION_1_1 ===
@@ -711,21 +666,16 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<SamplerYcbcrConversion>;
  };
-
  using SharedSamplerYcbcrConversion = SharedHandle<SamplerYcbcrConversion>;
-  using SharedSamplerYcbcrConversionKHR = SharedHandle<SamplerYcbcrConversion>;
-
-  template <>
+  using SharedSamplerYcbcrConversionKHR = SharedHandle<SamplerYcbcrConversion>;  template <>
  class SharedHandleTraits<DescriptorUpdateTemplate>
  {
  public:
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<DescriptorUpdateTemplate>;
  };
-
  using SharedDescriptorUpdateTemplate = SharedHandle<DescriptorUpdateTemplate>;
  using SharedDescriptorUpdateTemplateKHR = SharedHandle<DescriptorUpdateTemplate>;
-
  //=== VK_VERSION_1_3 ===
  template <>
  class SharedHandleTraits<PrivateDataSlot>
@@ -734,10 +684,8 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<PrivateDataSlot>;
  };
-
  using SharedPrivateDataSlot = SharedHandle<PrivateDataSlot>;
  using SharedPrivateDataSlotEXT = SharedHandle<PrivateDataSlot>;
-
  //=== VK_KHR_surface ===
  template <>
  class SharedHandleTraits<SurfaceKHR>
@@ -746,7 +694,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Instance;
    using deleter = detail::ObjectDestroyShared<SurfaceKHR>;
  };
-
  using SharedSurfaceKHR = SharedHandle<SurfaceKHR>;

  //=== VK_KHR_swapchain ===
@@ -757,7 +704,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<SwapchainKHR>;
  };
-
  using SharedSwapchainKHR = SharedHandle<SwapchainKHR>;

  //=== VK_KHR_display ===
@@ -768,7 +714,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = PhysicalDevice;
    using deleter = detail::ObjectDestroyShared<DisplayKHR>;
  };
-
  using SharedDisplayKHR = SharedHandle<DisplayKHR>;

  //=== VK_EXT_debug_report ===
@@ -779,7 +724,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Instance;
    using deleter = detail::ObjectDestroyShared<DebugReportCallbackEXT>;
  };
-
  using SharedDebugReportCallbackEXT = SharedHandle<DebugReportCallbackEXT>;

  //=== VK_KHR_video_queue ===
@@ -790,9 +734,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<VideoSessionKHR>;
  };
-
  using SharedVideoSessionKHR = SharedHandle<VideoSessionKHR>;
-
  template <>
  class SharedHandleTraits<VideoSessionParametersKHR>
  {
@@ -800,7 +742,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<VideoSessionParametersKHR>;
  };
-
  using SharedVideoSessionParametersKHR = SharedHandle<VideoSessionParametersKHR>;

  //=== VK_NVX_binary_import ===
@@ -811,9 +752,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<CuModuleNVX>;
  };
-
  using SharedCuModuleNVX = SharedHandle<CuModuleNVX>;
-
  template <>
  class SharedHandleTraits<CuFunctionNVX>
  {
@@ -821,7 +760,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<CuFunctionNVX>;
  };
-
  using SharedCuFunctionNVX = SharedHandle<CuFunctionNVX>;

  //=== VK_EXT_debug_utils ===
@@ -832,7 +770,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Instance;
    using deleter = detail::ObjectDestroyShared<DebugUtilsMessengerEXT>;
  };
-
  using SharedDebugUtilsMessengerEXT = SharedHandle<DebugUtilsMessengerEXT>;

  //=== VK_KHR_acceleration_structure ===
@@ -843,7 +780,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<AccelerationStructureKHR>;
  };
-
  using SharedAccelerationStructureKHR = SharedHandle<AccelerationStructureKHR>;

  //=== VK_EXT_validation_cache ===
@@ -854,7 +790,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<ValidationCacheEXT>;
  };
-
  using SharedValidationCacheEXT = SharedHandle<ValidationCacheEXT>;

  //=== VK_NV_ray_tracing ===
@@ -865,7 +800,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<AccelerationStructureNV>;
  };
-
  using SharedAccelerationStructureNV = SharedHandle<AccelerationStructureNV>;

  //=== VK_INTEL_performance_query ===
@@ -876,7 +810,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<PerformanceConfigurationINTEL>;
  };
-
  using SharedPerformanceConfigurationINTEL = SharedHandle<PerformanceConfigurationINTEL>;

  //=== VK_KHR_deferred_host_operations ===
@@ -887,7 +820,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<DeferredOperationKHR>;
  };
-
  using SharedDeferredOperationKHR = SharedHandle<DeferredOperationKHR>;

  //=== VK_NV_device_generated_commands ===
@@ -898,7 +830,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<IndirectCommandsLayoutNV>;
  };
-
  using SharedIndirectCommandsLayoutNV = SharedHandle<IndirectCommandsLayoutNV>;

 #if defined( VK_ENABLE_BETA_EXTENSIONS )
@@ -910,9 +841,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<CudaModuleNV>;
  };
-
  using SharedCudaModuleNV = SharedHandle<CudaModuleNV>;
-
  template <>
  class SharedHandleTraits<CudaFunctionNV>
  {
@@ -920,7 +849,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<CudaFunctionNV>;
  };
-
  using SharedCudaFunctionNV = SharedHandle<CudaFunctionNV>;
 #endif /*VK_ENABLE_BETA_EXTENSIONS*/

@@ -933,7 +861,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<BufferCollectionFUCHSIA>;
  };
-
  using SharedBufferCollectionFUCHSIA = SharedHandle<BufferCollectionFUCHSIA>;
 #endif /*VK_USE_PLATFORM_FUCHSIA*/

@@ -945,7 +872,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<MicromapEXT>;
  };
-
  using SharedMicromapEXT = SharedHandle<MicromapEXT>;

  //=== VK_ARM_tensors ===
@@ -956,9 +882,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<TensorARM>;
  };
-
  using SharedTensorARM = SharedHandle<TensorARM>;
-
  template <>
  class SharedHandleTraits<TensorViewARM>
  {
@@ -966,7 +890,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<TensorViewARM>;
  };
-
  using SharedTensorViewARM = SharedHandle<TensorViewARM>;

  //=== VK_NV_optical_flow ===
@@ -977,7 +900,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<OpticalFlowSessionNV>;
  };
-
  using SharedOpticalFlowSessionNV = SharedHandle<OpticalFlowSessionNV>;

  //=== VK_EXT_shader_object ===
@@ -988,7 +910,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<ShaderEXT>;
  };
-
  using SharedShaderEXT = SharedHandle<ShaderEXT>;

  //=== VK_KHR_pipeline_binary ===
@@ -999,7 +920,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<PipelineBinaryKHR>;
  };
-
  using SharedPipelineBinaryKHR = SharedHandle<PipelineBinaryKHR>;

  //=== VK_ARM_data_graph ===
@@ -1010,7 +930,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<DataGraphPipelineSessionARM>;
  };
-
  using SharedDataGraphPipelineSessionARM = SharedHandle<DataGraphPipelineSessionARM>;

  //=== VK_NV_external_compute_queue ===
@@ -1021,7 +940,6 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<ExternalComputeQueueNV>;
  };
-
  using SharedExternalComputeQueueNV = SharedHandle<ExternalComputeQueueNV>;

  //=== VK_EXT_device_generated_commands ===
@@ -1032,9 +950,7 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<IndirectCommandsLayoutEXT>;
  };
-
  using SharedIndirectCommandsLayoutEXT = SharedHandle<IndirectCommandsLayoutEXT>;
-
  template <>
  class SharedHandleTraits<IndirectExecutionSetEXT>
  {
@@ -1042,22 +958,22 @@ namespace VULKAN_HPP_NAMESPACE
    using DestructorType = Device;
    using deleter = detail::ObjectDestroyShared<IndirectExecutionSetEXT>;
  };
-
  using SharedIndirectExecutionSetEXT = SharedHandle<IndirectExecutionSetEXT>;

-  // a number of SharedHandle specializations
+  
 enum class SwapchainOwns
 {
  no,
  yes,
 };

-  struct ImageHeader : SharedHeader<DestructorTypeOf<Image>, typename SharedHandleTraits<Image>::deleter>
+struct ImageHeader : SharedHeader<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>, typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter>
 {
-    ImageHeader( SharedHandle<DestructorTypeOf<Image>>               parent,
-                 typename SharedHandleTraits<Image>::deleter deleter VULKAN_HPP_DEFAULT_ASSIGNMENT( typename SharedHandleTraits<Image>::deleter() ),
+  ImageHeader( SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>>       parent,
+               typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter deleter = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter(),
               SwapchainOwns                                                     swapchainOwned = SwapchainOwns::no ) VULKAN_HPP_NOEXCEPT
-      : SharedHeader<DestructorTypeOf<Image>, typename SharedHandleTraits<Image>::deleter>( std::move( parent ), std::move( deleter ) )
+    : SharedHeader<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>, typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter>( std::move( parent ),
+                                                                                                                                      std::move( deleter ) )
    , swapchainOwned( swapchainOwned )
  {
  }
@@ -1066,25 +982,25 @@ namespace VULKAN_HPP_NAMESPACE
 };

 template <>
-  class SharedHandle<Image> : public SharedHandleBase<Image, ImageHeader>
+class SharedHandle<VULKAN_HPP_NAMESPACE::Image> : public SharedHandleBase<VULKAN_HPP_NAMESPACE::Image, ImageHeader>
 {
-    using BaseType    = SharedHandleBase<Image, ImageHeader>;
-    using DeleterType = typename SharedHandleTraits<Image>::deleter;
+  using BaseType    = SharedHandleBase<VULKAN_HPP_NAMESPACE::Image, ImageHeader>;
+  using DeleterType = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter;
  friend BaseType;

 public:
  SharedHandle() = default;

-    explicit SharedHandle( Image                                 handle,
-                           SharedHandle<DestructorTypeOf<Image>> parent,
-                           SwapchainOwns swapchain_owned         VULKAN_HPP_DEFAULT_ASSIGNMENT( SwapchainOwns::no ),
-                           DeleterType deleter                   VULKAN_HPP_DEFAULT_ASSIGNMENT( DeleterType() ) ) VULKAN_HPP_NOEXCEPT
+  explicit SharedHandle( VULKAN_HPP_NAMESPACE::Image                                 handle,
+                         SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>> parent,
+                         SwapchainOwns                                               swapchain_owned = SwapchainOwns::no,
+                         DeleterType                                                 deleter         = DeleterType() ) VULKAN_HPP_NOEXCEPT
    : BaseType( handle, std::move( parent ), std::move( deleter ), swapchain_owned )
  {
  }

 protected:
-    static void internalDestroy( const ImageHeader & control, Image handle ) VULKAN_HPP_NOEXCEPT
+  static void internalDestroy( const ImageHeader & control, VULKAN_HPP_NAMESPACE::Image handle ) VULKAN_HPP_NOEXCEPT
  {
    if ( control.swapchainOwned == SwapchainOwns::no )
    {
@@ -1095,41 +1011,41 @@ namespace VULKAN_HPP_NAMESPACE

 struct SwapchainHeader
 {
-    SwapchainHeader( SharedHandle<SurfaceKHR>                     surface,
-                     SharedHandle<DestructorTypeOf<SwapchainKHR>> parent,
-                     typename SharedHandleTraits<SwapchainKHR>::deleter deleter
-                       VULKAN_HPP_DEFAULT_ASSIGNMENT( typename SharedHandleTraits<SwapchainKHR>::deleter() ) ) VULKAN_HPP_NOEXCEPT
+  SwapchainHeader( SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR>                           surface,
+                   SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>>       parent,
+                   typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter deleter =
+                     typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter() ) VULKAN_HPP_NOEXCEPT
    : surface( std::move( surface ) )
    , parent( std::move( parent ) )
    , deleter( std::move( deleter ) )
  {
  }

-    SharedHandle<SurfaceKHR>                           surface;
-    SharedHandle<DestructorTypeOf<SwapchainKHR>>       parent;
-    typename SharedHandleTraits<SwapchainKHR>::deleter deleter;
+  SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR>                           surface{};
+  SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>>       parent{};
+  typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter deleter{};
 };

 template <>
-  class SharedHandle<SwapchainKHR> : public SharedHandleBase<SwapchainKHR, SwapchainHeader>
+class SharedHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR> : public SharedHandleBase<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainHeader>
 {
-    using BaseType    = SharedHandleBase<SwapchainKHR, SwapchainHeader>;
-    using DeleterType = typename SharedHandleTraits<SwapchainKHR>::deleter;
+  using BaseType    = SharedHandleBase<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainHeader>;
+  using DeleterType = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter;
  friend BaseType;

 public:
  SharedHandle() = default;

-    explicit SharedHandle( SwapchainKHR                                 handle,
-                           SharedHandle<DestructorTypeOf<SwapchainKHR>> parent,
-                           SharedHandle<SurfaceKHR>                     surface,
-                           DeleterType deleter                          VULKAN_HPP_DEFAULT_ASSIGNMENT( DeleterType() ) ) VULKAN_HPP_NOEXCEPT
+  explicit SharedHandle( VULKAN_HPP_NAMESPACE::SwapchainKHR                                 handle,
+                         SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>> parent,
+                         SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR>                     surface,
+                         DeleterType                                                        deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT
    : BaseType( handle, std::move( surface ), std::move( parent ), std::move( deleter ) )
  {
  }

 public:
-    const SharedHandle<SurfaceKHR> & getSurface() const VULKAN_HPP_NOEXCEPT
+  const SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR> & getSurface() const VULKAN_HPP_NOEXCEPT
  {
    return getHeader().surface;
  }
@@ -1162,13 +1078,10 @@ namespace VULKAN_HPP_NAMESPACE

 public:
  SharedHandle() = default;
-
  explicit SharedHandle(PhysicalDevice handle, SharedInstance parent) noexcept
    : SharedHandleBaseNoDestroy<PhysicalDevice, SharedInstance>(handle, std::move(parent))
-    {
-    }
+  {}
 };
-
 using SharedPhysicalDevice = SharedHandle<PhysicalDevice>;

 template <>
@@ -1178,10 +1091,10 @@ namespace VULKAN_HPP_NAMESPACE

 public:
  SharedHandle() = default;
-
-    explicit SharedHandle( Queue handle, SharedDevice parent ) noexcept : SharedHandleBaseNoDestroy<Queue, SharedDevice>( handle, std::move( parent ) ) {}
+  explicit SharedHandle(Queue handle, SharedDevice parent) noexcept
+    : SharedHandleBaseNoDestroy<Queue, SharedDevice>(handle, std::move(parent))
+  {}
 };
-
 using SharedQueue = SharedHandle<Queue>;

  //=== VK_KHR_display ===
@@ -1193,13 +1106,10 @@ namespace VULKAN_HPP_NAMESPACE

 public:
  SharedHandle() = default;
-
  explicit SharedHandle(DisplayModeKHR handle, SharedDisplayKHR parent) noexcept
    : SharedHandleBaseNoDestroy<DisplayModeKHR, SharedDisplayKHR>(handle, std::move(parent))
-    {
-    }
+  {}
 };
-
 using SharedDisplayModeKHR = SharedHandle<DisplayModeKHR>;
 #endif // !VULKAN_HPP_NO_SMART_HANDLE
 } // namespace VULKAN_HPP_NAMESPACE
@@ -24,102 +24,22 @@ export namespace VULKAN_HPP_NAMESPACE
  namespace VULKAN_HPP_VIDEO_NAMESPACE
  {

-    //=================
-    //=== CONSTANTs ===
-    //=================
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
-    //=== vulkan_video_codec_h264std ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264CpbCntListSize;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264MaxChromaPlanes;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264MaxNumListRef;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264NoReferencePicture;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingList4X4NumElements;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingList4X4NumLists;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingList8X8NumElements;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingList8X8NumLists;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
-    //=== vulkan_video_codec_h264std_decode ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264FieldOrderCountListSize;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
-    //=== vulkan_video_codec_h265std ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ChromaQpOffsetListSize;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ChromaQpOffsetTileColsListSize;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ChromaQpOffsetTileRowsListSize;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265CpbCntListSize;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxChromaPlanes;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxDeltaPoc;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxDpbSize;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxLongTermPics;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxLongTermRefPicsSps;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxNumListRef;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265MaxShortTermRefPicSets;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265NoReferencePicture;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteCompEntriesListSize;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteComponentsListSize;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList16X16NumElements;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList16X16NumLists;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList32X32NumElements;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList32X32NumLists;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList4X4NumElements;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList4X4NumLists;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList8X8NumElements;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingList8X8NumLists;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SublayersListSize;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ )
-    //=== vulkan_video_codec_h265std_decode ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265RefPicSetListSize;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
-    //=== vulkan_video_codec_vp9std ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9LoopFilterAdjustments;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9MaxRefFrames;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9MaxSegmentationPredProb;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9MaxSegmentationTreeProbs;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9MaxSegments;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9NumRefFrames;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9RefsPerFrame;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Vp9SegLvlMax;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
-    //=== vulkan_video_codec_av1std ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1GlobalMotionParams;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1LoopFilterAdjustments;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxCdefFilterStrengths;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxLoopFilterStrengths;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumCbPoints;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumCrPoints;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumPlanes;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumPosChroma;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumPosLuma;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxNumYPoints;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxSegments;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxTileCols;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1MaxTileRows;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1NumRefFrames;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1PrimaryRefNone;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1RefsPerFrame;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1SegLvlMax;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1SelectIntegerMv;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1SelectScreenContentTools;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1SkipModeFrames;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::Av1TotalRefsPerFrame;
-#endif
-
    //=============
    //=== ENUMs ===
    //=============

-#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
-    //=== vulkan_video_codec_h264std ===
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ChromaSamplePosition;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorPrimaries;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameRestorationType;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1InterpolationFilter;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Level;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1MatrixCoefficients;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Profile;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ReferenceName;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TransferCharacteristics;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264FieldOrderCount;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264AspectRatioIdc;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264CabacInitIdc;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ChromaFormatIdc;
@@ -133,74 +53,63 @@ export namespace VULKAN_HPP_NAMESPACE
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ProfileIdc;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SliceType;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264WeightedBipredIdc;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
-    //=== vulkan_video_codec_h264std_decode ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264FieldOrderCount;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
-    //=== vulkan_video_codec_h265std ===
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265AspectRatioIdc;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ChromaFormatIdc;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265LevelIdc;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PictureType;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileIdc;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SliceType;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
-    //=== vulkan_video_codec_vp9std ===
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorSpace;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9FrameType;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9InterpolationFilter;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Level;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Profile;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ReferenceName;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
-    //=== vulkan_video_codec_av1std ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ChromaSamplePosition;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorPrimaries;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameRestorationType;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1InterpolationFilter;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Level;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1MatrixCoefficients;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Profile;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ReferenceName;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TransferCharacteristics;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode;
-#endif

    //===============
    //=== STRUCTS ===
    //===============

-#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
-    //=== vulkan_video_codec_h264std ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264HrdParameters;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PictureParameterSet;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PpsFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingLists;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SequenceParameterSet;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SequenceParameterSetVui;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SpsFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SpsVuiFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
-    //=== vulkan_video_codec_h264std_decode ===
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfig;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfigFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrain;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrainFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilterFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1QuantizationFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1SequenceHeader;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1SequenceHeaderFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1PictureInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1PictureInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1ReferenceInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1ReferenceInfoFlags;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264PictureInfo;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264PictureInfoFlags;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfo;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfoFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_ENCODE_H_ )
-    //=== vulkan_video_codec_h264std_encode ===
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265PictureInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265PictureInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265ReferenceInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265ReferenceInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeVP9PictureInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeVP9PictureInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1DecoderModelInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1OperatingPointInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1OperatingPointInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1PictureInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1PictureInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ReferenceInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ReferenceInfoFlags;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264PictureInfo;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264PictureInfoFlags;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceInfo;
@@ -213,10 +122,25 @@ export namespace VULKAN_HPP_NAMESPACE
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264SliceHeaderFlags;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTable;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTableFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
-    //=== vulkan_video_codec_h265std ===
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265LongTermRefPics;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265PictureInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265PictureInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfo;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfoFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265SliceSegmentHeader;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265SliceSegmentHeaderFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTable;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTableFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264HrdParameters;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PictureParameterSet;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PpsFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingLists;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SequenceParameterSet;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SequenceParameterSetVui;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SpsFlags;
+    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SpsVuiFlags;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265DecPicBufMgr;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265HrdFlags;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265HrdParameters;
@@ -236,88 +160,12 @@ export namespace VULKAN_HPP_NAMESPACE
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265VideoParameterSet;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265VpsFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ )
-    //=== vulkan_video_codec_h265std_decode ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265PictureInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265PictureInfoFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265ReferenceInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265ReferenceInfoFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_ENCODE_H_ )
-    //=== vulkan_video_codec_h265std_encode ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265LongTermRefPics;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265PictureInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265PictureInfoFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceInfoFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfoFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265SliceSegmentHeader;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265SliceSegmentHeaderFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTable;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTableFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
-    //=== vulkan_video_codec_vp9std ===
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfig;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfigFlags;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilter;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilterFlags;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Segmentation;
    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9SegmentationFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_DECODE_H_ )
-    //=== vulkan_video_codec_vp9std_decode ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeVP9PictureInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeVP9PictureInfoFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
-    //=== vulkan_video_codec_av1std ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfig;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfigFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrain;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrainFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilterFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1QuantizationFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1SequenceHeader;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1SequenceHeaderFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfoFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfoFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ )
-    //=== vulkan_video_codec_av1std_decode ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1PictureInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1PictureInfoFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1ReferenceInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1ReferenceInfoFlags;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_ENCODE_H_ )
-    //=== vulkan_video_codec_av1std_encode ===
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1DecoderModelInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1OperatingPointInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1OperatingPointInfoFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1PictureInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1PictureInfoFlags;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ReferenceInfo;
-    using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ReferenceInfoFlags;
-#endif

  }  // namespace VULKAN_HPP_VIDEO_NAMESPACE
 }  // namespace VULKAN_HPP_NAMESPACE
@@ -7,52 +7,22 @@
 #ifndef VULKAN_VIDEO_HPP
 #define VULKAN_VIDEO_HPP

-// here, we consider include files to be available when __has_include is not defined
-#if !defined( __has_include )
-#  define __has_include( x ) true
-#  define has_include_was_not_defined
-#endif
-
 // clang-format off
 #include <vulkan/vulkan.hpp>
 // clang-format on

-#if __has_include( <vk_video/vulkan_video_codecs_common.h> )
-#  include <vk_video/vulkan_video_codecs_common.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h264std.h> )
-#  include <vk_video/vulkan_video_codec_h264std.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h264std_decode.h> )
-#  include <vk_video/vulkan_video_codec_h264std_decode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h264std_encode.h> )
-#  include <vk_video/vulkan_video_codec_h264std_encode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h265std.h> )
-#  include <vk_video/vulkan_video_codec_h265std.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h265std_decode.h> )
-#  include <vk_video/vulkan_video_codec_h265std_decode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_h265std_encode.h> )
-#  include <vk_video/vulkan_video_codec_h265std_encode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_vp9std.h> )
-#  include <vk_video/vulkan_video_codec_vp9std.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_vp9std_decode.h> )
-#  include <vk_video/vulkan_video_codec_vp9std_decode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_av1std.h> )
 #include <vk_video/vulkan_video_codec_av1std.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_av1std_decode.h> )
 #include <vk_video/vulkan_video_codec_av1std_decode.h>
-#endif
-#if __has_include( <vk_video/vulkan_video_codec_av1std_encode.h> )
 #include <vk_video/vulkan_video_codec_av1std_encode.h>
-#endif
+#include <vk_video/vulkan_video_codec_h264std.h>
+#include <vk_video/vulkan_video_codec_h264std_decode.h>
+#include <vk_video/vulkan_video_codec_h264std_encode.h>
+#include <vk_video/vulkan_video_codec_h265std.h>
+#include <vk_video/vulkan_video_codec_h265std_decode.h>
+#include <vk_video/vulkan_video_codec_h265std_encode.h>
+#include <vk_video/vulkan_video_codec_vp9std.h>
+#include <vk_video/vulkan_video_codec_vp9std_decode.h>
+#include <vk_video/vulkan_video_codecs_common.h>

 #if !defined( VULKAN_HPP_VIDEO_NAMESPACE )
 #  define VULKAN_HPP_VIDEO_NAMESPACE video
@@ -63,96 +33,6 @@ namespace VULKAN_HPP_NAMESPACE
  namespace VULKAN_HPP_VIDEO_NAMESPACE
  {

-    //=================
-    //=== CONSTANTs ===
-    //=================
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
-    //=== vulkan_video_codec_h264std ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264CpbCntListSize            = 32;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264MaxChromaPlanes           = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264MaxNumListRef             = 32;
-    VULKAN_HPP_CONSTEXPR_INLINE uint8_t  H264NoReferencePicture        = 0xFF;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList4X4NumElements = 16;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList4X4NumLists    = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList8X8NumElements = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList8X8NumLists    = 6;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
-    //=== vulkan_video_codec_h264std_decode ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t DecodeH264FieldOrderCountListSize = 2;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
-    //=== vulkan_video_codec_h265std ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ChromaQpOffsetListSize              = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ChromaQpOffsetTileColsListSize      = 19;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ChromaQpOffsetTileRowsListSize      = 21;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265CpbCntListSize                      = 32;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxChromaPlanes                     = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxDeltaPoc                         = 48;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxDpbSize                          = 16;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxLongTermPics                     = 16;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxLongTermRefPicsSps               = 32;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxNumListRef                       = 15;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxShortTermRefPicSets              = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint8_t  H265NoReferencePicture                  = 0xFF;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265PredictorPaletteComponentsListSize  = 3;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265PredictorPaletteCompEntriesListSize = 128;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList16X16NumElements         = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList16X16NumLists            = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList32X32NumElements         = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList32X32NumLists            = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList4X4NumElements           = 16;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList4X4NumLists              = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList8X8NumElements           = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList8X8NumLists              = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265SublayersListSize                   = 7;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ )
-    //=== vulkan_video_codec_h265std_decode ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t DecodeH265RefPicSetListSize = 8;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
-    //=== vulkan_video_codec_vp9std ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9LoopFilterAdjustments    = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxRefFrames             = 4;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxSegmentationPredProb  = 3;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxSegmentationTreeProbs = 7;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxSegments              = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9NumRefFrames             = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9RefsPerFrame             = 3;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9SegLvlMax                = 4;
-#endif
-
-#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
-    //=== vulkan_video_codec_av1std ===
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1GlobalMotionParams       = 6;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1LoopFilterAdjustments    = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxCdefFilterStrengths   = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxLoopFilterStrengths   = 4;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumCbPoints           = 10;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumCrPoints           = 10;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumPlanes             = 3;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumPosChroma          = 25;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumPosLuma            = 24;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumYPoints            = 14;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxSegments              = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxTileCols              = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxTileRows              = 64;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1NumRefFrames             = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint8_t  Av1PrimaryRefNone           = 7;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1RefsPerFrame             = 7;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1SegLvlMax                = 8;
-    VULKAN_HPP_CONSTEXPR_INLINE uint8_t  Av1SelectIntegerMv          = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1SelectScreenContentTools = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1SkipModeFrames           = 2;
-    VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1TotalRefsPerFrame        = 8;
-#endif
-
    //=============
    //=== ENUMs ===
    //=============
@@ -739,9 +619,9 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                                          bit_rate_scale                          = {};
      uint8_t                                                                          cpb_size_scale                          = {};
      uint8_t                                                                          reserved1                               = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> bit_rate_value_minus1                   = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> cpb_size_value_minus1                   = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE>  cbr_flag                                = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> bit_rate_value_minus1                   = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> cpb_size_value_minus1                   = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE>  cbr_flag                                = {};
      uint32_t                                                                         initial_cpb_removal_delay_length_minus1 = {};
      uint32_t                                                                         cpb_removal_delay_length_minus1         = {};
      uint32_t                                                                         dpb_output_delay_length_minus1          = {};
@@ -907,8 +787,10 @@ namespace VULKAN_HPP_NAMESPACE
    public:
      uint16_t scaling_list_present_mask       = {};
      uint16_t use_default_scaling_matrix_mask = {};
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS> ScalingList4x4                  = {};
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS> ScalingList8x8                  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS>
+        ScalingList4x4 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS>
+        ScalingList8x8 = {};
    };

    struct H264SequenceParameterSet
@@ -1183,7 +1065,7 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                                                          reserved2            = {};
      uint16_t                                                                                         frame_num            = {};
      uint16_t                                                                                         idr_pic_id           = {};
-      ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE>   PicOrderCnt          = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE> PicOrderCnt          = {};
    };

    struct DecodeH264ReferenceInfoFlags
@@ -1266,7 +1148,7 @@ namespace VULKAN_HPP_NAMESPACE
      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfoFlags                   flags       = {};
      uint16_t                                                                                         FrameNum    = {};
      uint16_t                                                                                         reserved    = {};
-      ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE>     PicOrderCnt = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE> PicOrderCnt = {};
    };
 #endif

@@ -1357,14 +1239,14 @@ namespace VULKAN_HPP_NAMESPACE
      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTableFlags                                    flags                    = {};
      uint8_t                                                                                                         luma_log2_weight_denom   = {};
      uint8_t                                                                                                         chroma_log2_weight_denom = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_weight_l0           = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_offset_l0           = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l0         = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l0         = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_weight_l1           = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_offset_l1           = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l1         = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l1         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_weight_l0           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_offset_l0           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l0         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l0         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_weight_l1           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                                   luma_offset_l1           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l1         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l1         = {};
    };

    struct EncodeH264SliceHeaderFlags
@@ -1663,12 +1545,12 @@ namespace VULKAN_HPP_NAMESPACE
      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfoFlags    flags                        = {};
      uint8_t                                                                                num_ref_idx_l0_active_minus1 = {};
      uint8_t                                                                                num_ref_idx_l1_active_minus1 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                               RefPicList0                  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>                               RefPicList1                  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>         RefPicList0                  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF>         RefPicList1                  = {};
      uint8_t                                                                                refList0ModOpCount           = {};
      uint8_t                                                                                refList1ModOpCount           = {};
      uint8_t                                                                                refPicMarkingOpCount         = {};
-      ArrayWrapper1D<uint8_t, 7>                                                             reserved1                    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 7>                                       reserved1                    = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefListModEntry *    pRefList0ModOperations       = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefListModEntry *    pRefList1ModOperations       = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefPicMarkingEntry * pRefPicMarkingOperations     = {};
@@ -1720,7 +1602,7 @@ namespace VULKAN_HPP_NAMESPACE
      uint32_t                                                                               frame_num   = {};
      int32_t                                                                                PicOrderCnt = {};
      uint8_t                                                                                temporal_id = {};
-      ArrayWrapper1D<uint8_t, 3>                                                             reserved1   = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 3>                                       reserved1   = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfo * pRefLists   = {};
    };

@@ -1862,9 +1744,9 @@ namespace VULKAN_HPP_NAMESPACE
      }

    public:
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> max_latency_increase_plus1   = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>  max_dec_pic_buffering_minus1 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>  max_num_reorder_pics         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> max_latency_increase_plus1   = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>  max_dec_pic_buffering_minus1 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>  max_num_reorder_pics         = {};
    };

    struct H265SubLayerHrdParameters
@@ -1904,10 +1786,10 @@ namespace VULKAN_HPP_NAMESPACE
      }

    public:
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_value_minus1    = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_value_minus1    = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_du_value_minus1 = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_du_value_minus1 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_value_minus1    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_value_minus1    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_du_value_minus1 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_du_value_minus1 = {};
      uint32_t                                                                         cbr_flag                 = {};
    };

@@ -2013,9 +1895,9 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                                             initial_cpb_removal_delay_length_minus1      = {};
      uint8_t                                                                             au_cpb_removal_delay_length_minus1           = {};
      uint8_t                                                                             dpb_output_delay_length_minus1               = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>                         cpb_cnt_minus1                               = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>                        elemental_duration_in_tc_minus1              = {};
-      ArrayWrapper1D<uint16_t, 3>                                                         reserved                                     = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>   cpb_cnt_minus1                               = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE>  elemental_duration_in_tc_minus1              = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, 3>                                   reserved                                     = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters * pSubLayerHrdParametersNal                    = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters * pSubLayerHrdParametersVcl                    = {};
    };
@@ -2240,12 +2122,16 @@ namespace VULKAN_HPP_NAMESPACE
      }

    public:
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS>     ScalingList4x4         = {};
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS>     ScalingList8x8         = {};
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS> ScalingList16x16       = {};
-      ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS> ScalingList32x32       = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS>                                                 ScalingListDCCoef16x16 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS>                                                 ScalingListDCCoef32x32 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS>
+        ScalingList4x4 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS>
+        ScalingList8x8 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS>
+        ScalingList16x16 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS>
+                                                                                                 ScalingList32x32       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS> ScalingListDCCoef16x16 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS> ScalingListDCCoef32x32 = {};
    };

    struct H265SpsVuiFlags
@@ -2425,6 +2311,7 @@ namespace VULKAN_HPP_NAMESPACE
      }

    public:
+      VULKAN_HPP_NAMESPACE::
        ArrayWrapper2D<uint16_t, STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE, STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE>
          PredictorPaletteEntries = {};
    };
@@ -2609,8 +2496,8 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                                       reserved3                = {};
      uint8_t                                                                       num_negative_pics        = {};
      uint8_t                                                                       num_positive_pics        = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE>                         delta_poc_s0_minus1      = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE>                         delta_poc_s1_minus1      = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE>   delta_poc_s0_minus1      = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE>   delta_poc_s1_minus1      = {};
    };

    struct H265LongTermRefPicsSps
@@ -2649,7 +2536,7 @@ namespace VULKAN_HPP_NAMESPACE

    public:
      uint32_t                                                                                  used_by_curr_pic_lt_sps_flag = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_ref_pic_poc_lsb_sps       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_ref_pic_poc_lsb_sps       = {};
    };

    struct H265SequenceParameterSet
@@ -2915,8 +2802,8 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                                                             log2_max_transform_skip_block_size_minus2 = {};
      uint8_t                                                                                             diff_cu_chroma_qp_offset_depth            = {};
      uint8_t                                                                                             chroma_qp_offset_list_len_minus1          = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE>                     cb_qp_offset_list                         = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE>                     cr_qp_offset_list                         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE>             cb_qp_offset_list                         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE>             cr_qp_offset_list                         = {};
      uint8_t                                                                                             log2_sao_offset_scale_luma                = {};
      uint8_t                                                                                             log2_sao_offset_scale_chroma              = {};
      int8_t                                                                                              pps_act_y_qp_offset_plus5                 = {};
@@ -2929,8 +2816,8 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                                                             num_tile_rows_minus1                      = {};
      uint8_t                                                                                             reserved1                                 = {};
      uint8_t                                                                                             reserved2                                 = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE>         column_width_minus1                       = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE>         row_height_minus1                         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE> column_width_minus1                       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE> row_height_minus1                         = {};
      uint32_t                                                                                            reserved3                                 = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingLists *                          pScalingLists                             = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteEntries *               pPredictorPaletteEntries                  = {};
@@ -3030,9 +2917,9 @@ namespace VULKAN_HPP_NAMESPACE
      int32_t                                                                                    PicOrderCntVal               = {};
      uint16_t                                                                                   NumBitsForSTRefPicSetInSlice = {};
      uint16_t                                                                                   reserved                     = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE>         RefPicSetStCurrBefore        = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE>         RefPicSetStCurrAfter         = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE>         RefPicSetLtCurr              = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetStCurrBefore        = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetStCurrAfter         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetLtCurr              = {};
    };

    struct DecodeH265ReferenceInfoFlags
@@ -3202,14 +3089,14 @@ namespace VULKAN_HPP_NAMESPACE
      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTableFlags                                    flags                          = {};
      uint8_t                                                                                                         luma_log2_weight_denom         = {};
      int8_t                                                                                                          delta_chroma_log2_weight_denom = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   delta_luma_weight_l0           = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   luma_offset_l0                 = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l0         = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l0         = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   delta_luma_weight_l1           = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   luma_offset_l1                 = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l1         = {};
-      ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l1         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   delta_luma_weight_l0           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   luma_offset_l0                 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l0         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l0         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   delta_luma_weight_l1           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                                   luma_offset_l1                 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l1         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l1         = {};
    };

    struct EncodeH265SliceSegmentHeaderFlags
@@ -3409,10 +3296,10 @@ namespace VULKAN_HPP_NAMESPACE
      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfoFlags flags                        = {};
      uint8_t                                                                             num_ref_idx_l0_active_minus1 = {};
      uint8_t                                                                             num_ref_idx_l1_active_minus1 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                            RefPicList0                  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                            RefPicList1                  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                            list_entry_l0                = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>                            list_entry_l1                = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>      RefPicList0                  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>      RefPicList1                  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>      list_entry_l0                = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF>      list_entry_l1                = {};
    };

    struct EncodeH265PictureInfoFlags
@@ -3506,11 +3393,11 @@ namespace VULKAN_HPP_NAMESPACE
    public:
      uint8_t                                                                                  num_long_term_sps          = {};
      uint8_t                                                                                  num_long_term_pics         = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_idx_sps                 = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_PICS>         poc_lsb_lt                 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_idx_sps                 = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_PICS>         poc_lsb_lt                 = {};
      uint16_t                                                                                 used_by_curr_pic_lt_flag   = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC>              delta_poc_msb_present_flag = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC>              delta_poc_msb_cycle_lt     = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC>              delta_poc_msb_present_flag = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC>              delta_poc_msb_cycle_lt     = {};
    };

    struct EncodeH265PictureInfo
@@ -3560,7 +3447,7 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                           short_term_ref_pic_set_idx               = {};
      int32_t                                                           PicOrderCntVal                           = {};
      uint8_t                                                           TemporalId                               = {};
-      ArrayWrapper1D<uint8_t, 7>                                        reserved1                                = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 7>                  reserved1                                = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfo * pRefLists           = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ShortTermRefPicSet *       pShortTermRefPicSet = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265LongTermRefPics *    pLongTermRefPics    = {};
@@ -3817,9 +3704,9 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                                             loop_filter_level       = {};
      uint8_t                                                                             loop_filter_sharpness   = {};
      uint8_t                                                                             update_ref_delta        = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_VP9_MAX_REF_FRAMES>                 loop_filter_ref_deltas  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_VP9_MAX_REF_FRAMES>          loop_filter_ref_deltas  = {};
      uint8_t                                                                             update_mode_delta       = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS>        loop_filter_mode_deltas = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS> loop_filter_mode_deltas = {};
    };

    struct VP9SegmentationFlags
@@ -3903,10 +3790,10 @@ namespace VULKAN_HPP_NAMESPACE

    public:
      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9SegmentationFlags                               flags                   = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS>             segmentation_tree_probs = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB>              segmentation_pred_prob  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTS>                            FeatureEnabled          = {};
-      ArrayWrapper2D<int16_t, STD_VIDEO_VP9_MAX_SEGMENTS, STD_VIDEO_VP9_SEG_LVL_MAX> FeatureData             = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS>             segmentation_tree_probs = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB>              segmentation_pred_prob  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTS>                            FeatureEnabled          = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int16_t, STD_VIDEO_VP9_MAX_SEGMENTS, STD_VIDEO_VP9_SEG_LVL_MAX> FeatureData             = {};
    };
 #endif

@@ -4018,7 +3905,7 @@ namespace VULKAN_HPP_NAMESPACE
      int8_t                                                                    delta_q_uv_ac  = {};
      uint8_t                                                                   tile_cols_log2 = {};
      uint8_t                                                                   tile_rows_log2 = {};
-      ArrayWrapper1D<uint16_t, 3>                                               reserved1      = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, 3>                         reserved1      = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfig *  pColorConfig   = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilter *   pLoopFilter    = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Segmentation * pSegmentation  = {};
@@ -4283,12 +4170,12 @@ namespace VULKAN_HPP_NAMESPACE

    public:
      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilterFlags                   flags                   = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS>     loop_filter_level       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS> loop_filter_level       = {};
      uint8_t                                                                                loop_filter_sharpness   = {};
      uint8_t                                                                                update_ref_delta        = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME>           loop_filter_ref_deltas  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME>       loop_filter_ref_deltas  = {};
      uint8_t                                                                                update_mode_delta       = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS>        loop_filter_mode_deltas = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS>    loop_filter_mode_deltas = {};
    };

    struct AV1QuantizationFlags
@@ -4415,8 +4302,8 @@ namespace VULKAN_HPP_NAMESPACE
      }

    public:
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_SEGMENTS>                            FeatureEnabled = {};
-      ArrayWrapper2D<int16_t, STD_VIDEO_AV1_MAX_SEGMENTS, STD_VIDEO_AV1_SEG_LVL_MAX> FeatureData    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_SEGMENTS>                            FeatureEnabled = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int16_t, STD_VIDEO_AV1_MAX_SEGMENTS, STD_VIDEO_AV1_SEG_LVL_MAX> FeatureData    = {};
    };

    struct AV1TileInfoFlags
@@ -4501,7 +4388,7 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                            TileRows                = {};
      uint16_t                                                           context_update_tile_id  = {};
      uint8_t                                                            tile_size_bytes_minus_1 = {};
-      ArrayWrapper1D<uint8_t, 7>                                         reserved1               = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 7>                   reserved1               = {};
      const uint16_t *                                                   pMiColStarts            = {};
      const uint16_t *                                                   pMiRowStarts            = {};
      const uint16_t *                                                   pWidthInSbsMinus1       = {};
@@ -4547,10 +4434,10 @@ namespace VULKAN_HPP_NAMESPACE
    public:
      uint8_t                                                                                cdef_damping_minus_3 = {};
      uint8_t                                                                                cdef_bits            = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_pri_strength  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_sec_strength  = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_pri_strength = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_sec_strength = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_pri_strength  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_sec_strength  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_pri_strength = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_sec_strength = {};
    };

    struct AV1LoopRestoration
@@ -4588,8 +4475,8 @@ namespace VULKAN_HPP_NAMESPACE
      }

    public:
-      ArrayWrapper1D<StdVideoAV1FrameRestorationType, STD_VIDEO_AV1_MAX_NUM_PLANES> FrameRestorationType = {};
-      ArrayWrapper1D<uint16_t, STD_VIDEO_AV1_MAX_NUM_PLANES>                        LoopRestorationSize  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<StdVideoAV1FrameRestorationType, STD_VIDEO_AV1_MAX_NUM_PLANES> FrameRestorationType = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_AV1_MAX_NUM_PLANES>                        LoopRestorationSize  = {};
    };

    struct AV1GlobalMotion
@@ -4627,8 +4514,8 @@ namespace VULKAN_HPP_NAMESPACE
      }

    public:
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                                     GmType    = {};
-      ArrayWrapper2D<int32_t, STD_VIDEO_AV1_NUM_REF_FRAMES, STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS> gm_params = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                                     GmType    = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int32_t, STD_VIDEO_AV1_NUM_REF_FRAMES, STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS> gm_params = {};
    };

    struct AV1FilmGrainFlags
@@ -4725,17 +4612,17 @@ namespace VULKAN_HPP_NAMESPACE
      uint16_t                                                                       grain_seed                = {};
      uint8_t                                                                        film_grain_params_ref_idx = {};
      uint8_t                                                                        num_y_points              = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS>             point_y_value             = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS>             point_y_scaling           = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS>  point_y_value             = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS>  point_y_scaling           = {};
      uint8_t                                                                        num_cb_points             = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS>            point_cb_value            = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS>            point_cb_scaling          = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS> point_cb_value            = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS> point_cb_scaling          = {};
      uint8_t                                                                        num_cr_points             = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS>            point_cr_value            = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS>            point_cr_scaling          = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_LUMA>              ar_coeffs_y_plus_128      = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA>            ar_coeffs_cb_plus_128     = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA>            ar_coeffs_cr_plus_128     = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS> point_cr_value            = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS> point_cr_scaling          = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_LUMA>   ar_coeffs_y_plus_128      = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA> ar_coeffs_cb_plus_128     = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA> ar_coeffs_cr_plus_128     = {};
      uint8_t                                                                        cb_mult                   = {};
      uint8_t                                                                        cb_luma_mult              = {};
      uint16_t                                                                       cb_offset                 = {};
@@ -4861,7 +4748,7 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                      order_hint_bits_minus_1            = {};
      uint8_t                                                      seq_force_integer_mv               = {};
      uint8_t                                                      seq_force_screen_content_tools     = {};
-      ArrayWrapper1D<uint8_t, 5>                                   reserved1                          = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 5>             reserved1                          = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfig * pColorConfig           = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfo *  pTimingInfo            = {};
    };
@@ -5003,11 +4890,11 @@ namespace VULKAN_HPP_NAMESPACE
      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode TxMode       = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode::eOnly4X4;
      uint8_t                                                     delta_q_res  = {};
      uint8_t                                                     delta_lf_res = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_SKIP_MODE_FRAMES>                   SkipModeFrame       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_SKIP_MODE_FRAMES> SkipModeFrame    = {};
      uint8_t                                                                       coded_denom      = {};
-      ArrayWrapper1D<uint8_t, 3>                                                reserved2           = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                     OrderHints          = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                    expectedFrameId     = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 3>                              reserved2        = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>   OrderHints       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_NUM_REF_FRAMES>  expectedFrameId  = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo *         pTileInfo        = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization *     pQuantization    = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation *     pSegmentation    = {};
@@ -5099,7 +4986,7 @@ namespace VULKAN_HPP_NAMESPACE
      uint8_t                                                                       frame_type       = {};
      uint8_t                                                                       RefFrameSignBias = {};
      uint8_t                                                                       OrderHint        = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                         SavedOrderHints  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>   SavedOrderHints  = {};
    };
 #endif

@@ -5417,10 +5304,10 @@ namespace VULKAN_HPP_NAMESPACE
      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode TxMode       = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode::eOnly4X4;
      uint8_t                                                     delta_q_res  = {};
      uint8_t                                                     delta_lf_res = {};
-      ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>                     ref_order_hint               = {};
-      ArrayWrapper1D<int8_t, STD_VIDEO_AV1_REFS_PER_FRAME>                      ref_frame_idx                = {};
-      ArrayWrapper1D<uint8_t, 3>                                                reserved1                    = {};
-      ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_REFS_PER_FRAME>                    delta_frame_id_minus_1       = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES>        ref_order_hint         = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_REFS_PER_FRAME>         ref_frame_idx          = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 3>                                   reserved1              = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_REFS_PER_FRAME>       delta_frame_id_minus_1 = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo *              pTileInfo              = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization *          pQuantization          = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation *          pSegmentation          = {};
@@ -5513,17 +5400,11 @@ namespace VULKAN_HPP_NAMESPACE
      uint32_t                                                                      RefFrameId = {};
      VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType frame_type = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType::eKey;
      uint8_t                                                        OrderHint  = {};
-      ArrayWrapper1D<uint8_t, 3>                                     reserved1  = {};
+      VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 3>               reserved1  = {};
      const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader * pExtensionHeader = {};
    };
 #endif

  }  // namespace VULKAN_HPP_VIDEO_NAMESPACE
 }  // namespace VULKAN_HPP_NAMESPACE
-
-#if defined( has_include_was_not_defined )
-#  undef has_include_was_not_defined
-#  undef __has_include
-#endif
-
 #endif
@@ -11,6 +11,12 @@ set_targetdir("./")
 set_optimize("fastest")

 -- Options
+
+option("images_optimized")
+	set_default(true)
+	add_defines("IMAGE_OPTIMIZED")
+option_end()
+
 option("force_integrated_gpu")
 	set_default(false)
 	add_defines("FORCE_INTEGRATED_GPU")
@@ -42,6 +48,7 @@ target("mlx")
 	set_default(true)
 	set_license("MIT")
 	set_kind("shared")
+	add_options("images_optimized")
 	add_options("force_integrated_gpu")
 	add_options("graphics_memory_dump")
 	add_options("profiler")
Author	SHA1	Message	Date
Kbz-8	5df699c547	working on python bindings	2025-10-22 08:25:00 +02:00
Kbz-8	0d0d2d4451	fixing strings management	2025-10-16 10:36:31 +02:00
Kbz-8	73d31c196e	adding python bindings base	2025-10-15 22:32:21 +02:00