Skip to content

Large stylistic cleanup #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solidpixel merged 2 commits into from
Oct 28, 2026
Merged

Large stylistic cleanup #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f980e2a
Fix function parameter formatting
solidpixel Oct 28, 2026
3344c19
Cleanup Doxygen
solidpixel Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 0 additions & 165 deletions .clang-format
View file
Open in desktop

This file was deleted.

56 changes: 25 additions & 31 deletions generator/generate_vulkan_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: MIT
# -----------------------------------------------------------------------------
# Copyright (c) 2024-2025 Arm Limited
# Copyright (c) 2024-2026 Arm Limited
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
Expand Down Expand Up @@ -490,13 +490,11 @@ def generate_instance_decls(
file.write('#pragma once\n')
file.write('\n')

file.write('// clang-format off\n')
file.write('\n')

file.write('#include <vulkan/vulkan.h>\n')
file.write('\n')

# Create a listing of API versions and API extensions
blocks = []
for command in commands:
if command.dispatch_type != 'instance':
continue
Expand Down Expand Up @@ -542,10 +540,10 @@ def generate_instance_decls(
if plat_define:
lines.append('#endif\n')

file.write('\n'.join(lines))
file.write('\n')
blocks.append('\n'.join(lines).rstrip('\n'))

file.write('// clang-format on\n')
file.write('\n\n'.join(blocks))
file.write('\n')


def generate_instance_queries(
Expand All @@ -564,13 +562,11 @@ def generate_instance_queries(
file.write('#pragma once\n')
file.write('\n')

file.write('// clang-format off\n')
file.write('\n')

file.write('#include <vulkan/vulkan.h>\n')
file.write('\n')

# Create a listing of API versions and API extensions
blocks = []
for command in commands:
if command.dispatch_type != 'instance':
continue
Expand All @@ -588,7 +584,7 @@ def generate_instance_queries(
for (ptype, pname, array) in command.params:
plist.append(f'{ptype} {pname}{array}')
nlist.append(pname)
plist_str = ', '.join(plist)
plist_str = ',\n '.join(plist)
nlist_str = ', '.join(nlist)

lines.append('/* Test for user_tag availability. */')
Expand All @@ -603,8 +599,8 @@ def generate_instance_queries(

# Define the function pointer resolution
lines.append('/* Function pointer resolution. */')
decl = f'constexpr PFN_{command.name} getLayerPtr_{command.name}()\n' \
f'{{\n' \
decl = f'constexpr PFN_{command.name}' \
f' getLayerPtr_{command.name}()\n{{\n' \
f' return [] <typename T>\n' \
f' {{\n' \
f' if constexpr(hasLayerPtr_{command.name}<T>)\n' \
Expand All @@ -621,10 +617,10 @@ def generate_instance_queries(
if plat_define:
lines.append('#endif\n')

file.write('\n'.join(lines))
file.write('\n')
blocks.append('\n'.join(lines).rstrip('\n'))

file.write('// clang-format on\n')
file.write('\n\n'.join(blocks))
file.write('\n')


def generate_instance_defs(
Expand Down Expand Up @@ -690,7 +686,8 @@ def generate_instance_defs(
lines.append('#endif\n')

data = data.replace('{FUNCTION_DEFS}', '\n'.join(lines))
file.write(data)
file.write(data.rstrip('\n'))
file.write('\n')


def generate_device_dispatch_table(
Expand Down Expand Up @@ -764,14 +761,12 @@ def generate_device_decls(
file.write('#pragma once\n')
file.write('\n')

file.write('// clang-format off\n')
file.write('\n')

file.write('#include <vulkan/vulkan.h>\n\n')
file.write('#include "framework/utils.hpp"\n')
file.write('\n')

# Create a listing of API versions and API extensions
blocks = []
for command in commands:
if command.dispatch_type != 'device':
continue
Expand Down Expand Up @@ -817,10 +812,10 @@ def generate_device_decls(
if plat_define:
lines.append('#endif\n')

file.write('\n'.join(lines))
file.write('\n')
blocks.append('\n'.join(lines).rstrip('\n'))

file.write('// clang-format on\n')
file.write('\n\n'.join(blocks))
file.write('\n')


def generate_device_defs(
Expand Down Expand Up @@ -886,7 +881,8 @@ def generate_device_defs(
lines.append('#endif\n')

data = data.replace('{FUNCTION_DEFS}', '\n'.join(lines))
file.write(data)
file.write(data.rstrip('\n'))
file.write('\n')


def generate_device_queries(
Expand All @@ -906,14 +902,12 @@ def generate_device_queries(
file.write('#pragma once\n')
file.write('\n')

file.write('// clang-format off\n')
file.write('\n')

file.write('#include <vulkan/vulkan.h>\n\n')
file.write('#include "framework/utils.hpp"\n')
file.write('\n')

# Create a listing of API versions and API extensions
blocks = []
for command in commands:
if command.dispatch_type != 'device':
continue
Expand All @@ -931,7 +925,7 @@ def generate_device_queries(
for (ptype, pname, array) in command.params:
plist.append(f'{ptype} {pname}{array}')
nlist.append(pname)
plist_str = ', '.join(plist)
plist_str = ',\n '.join(plist)
nlist_str = ', '.join(nlist)

lines.append('/* Test for user_tag availability. */')
Expand Down Expand Up @@ -964,10 +958,10 @@ def generate_device_queries(
if plat_define:
lines.append('#endif\n')

file.write('\n'.join(lines))
file.write('\n')
blocks.append('\n'.join(lines).rstrip('\n'))

file.write('// clang-format on\n')
file.write('\n\n'.join(blocks))
file.write('\n')


def main() -> int:
Expand Down
3 changes: 0 additions & 3 deletions generator/vk_codegen/device_defs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// clang-format off

#include <mutex>

// Include from per-layer code
Expand All @@ -12,4 +10,3 @@
extern std::mutex g_vulkanLock;

{FUNCTION_DEFS}
// clang-format on
4 changes: 0 additions & 4 deletions generator/vk_codegen/device_dispatch_table.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once

// clang-format off

#include <vulkan/vulkan.h>

#include "framework/device_functions.hpp"
Expand Down Expand Up @@ -74,5 +72,3 @@ static inline void initDriverDeviceDispatchTable(
}

#undef ENTRY

// clang-format on
3 changes: 0 additions & 3 deletions generator/vk_codegen/instance_defs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// clang-format off

#include <mutex>

// Include from per-layer code
Expand All @@ -14,4 +12,3 @@
extern std::mutex g_vulkanLock;

{FUNCTION_DEFS}
// clang-format on
4 changes: 0 additions & 4 deletions generator/vk_codegen/instance_dispatch_table.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once

// clang-format off

#include <vulkan/vulkan.h>

#include "framework/device_functions.hpp"
Expand Down Expand Up @@ -78,5 +76,3 @@ static inline void initDriverInstanceDispatchTable(
}

#undef ENTRY

// clang-format on
Loading