.clang-tidy

@@ -1,45 +0,0 @@
----
-Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,cppcoreguidelines-pro-type-member-init,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-nullptr,readability-braces-around-statements,readability-redundant-member-init'
-WarningsAsErrors: ''
-HeaderFilterRegex: ''
-FormatStyle: none
-CheckOptions:
-  - key:             cert-dcl16-c.NewSuffixes
-    value:           'L;LL;LU;LLU'
-  - key:             cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField
-    value:           '0'
-  - key:             cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors
-    value:           '1'
-  - key:             cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
-    value:           '1'
-  - key:             cppcoreguidelines-pro-type-member-init.IgnoreArrays
-    value:           '1'
-  - key:             cppcoreguidelines-pro-type-member-init.UseAssignment
-    value:           '1'
-  - key:             google-readability-function-size.StatementThreshold
-    value:           '800'
-  - key:             google-readability-namespace-comments.ShortNamespaceLines
-    value:           '10'
-  - key:             google-readability-namespace-comments.SpacesBeforeComments
-    value:           '2'
-  - key:             modernize-loop-convert.MaxCopySize
-    value:           '16'
-  - key:             modernize-loop-convert.MinConfidence
-    value:           reasonable
-  - key:             modernize-loop-convert.NamingStyle
-    value:           CamelCase
-  - key:             modernize-pass-by-value.IncludeStyle
-    value:           llvm
-  - key:             modernize-replace-auto-ptr.IncludeStyle
-    value:           llvm
-  - key:             modernize-use-bool-literals.IgnoreMacros
-    value:           '0'
-  - key:             modernize-use-default-member-init.IgnoreMacros
-    value:           '0'
-  - key:             modernize-use-default-member-init.UseAssignment
-    value:           '1'
-  - key:             modernize-use-nullptr.NullMacros
-    value:           'NULL'
-  - key:             readability-braces-around-statements.ShortStatementLines
-    value:           '0'
-...

aster/CMakeLists.txt

@@ -10,23 +10,10 @@ find_package(Vulkan REQUIRED)
 find_package(fmt CONFIG REQUIRED)
 find_package(VulkanMemoryAllocator CONFIG REQUIRED)
 
-set(HEADER_FILES
+set(HEADER_FILES constants.h config.h logger.h global.h context.h window.h
-        constants.h
+        physical_device.h)
-        config.h
+set(SOURCE_FILES logger.cpp global.cpp context.cpp window.cpp
-        logger.h
+        physical_device.cpp)
-        global.h
-        context.h
-        window.h
-        physical_device.h
-        device.h)
-
-set(SOURCE_FILES
-        logger.cpp
-        global.cpp
-        context.cpp
-        window.cpp
-        physical_device.cpp
-        device.cpp)
 
 add_library(aster_core STATIC ${SOURCE_FILES} ${HEADER_FILES})
 set_property(TARGET aster_core PROPERTY CXX_STANDARD 20)

aster/config.h

@@ -12,9 +12,6 @@
 #define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
 #define VULKAN_HPP_NO_STRUCT_CONSTRUCTORS
 
-#define VMA_STATIC_VULKAN_FUNCTIONS 0
-#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
-
 #if defined(NDEBUG)
 #define USE_OPTICK (0)
 #else

aster/constants.h

@@ -49,17 +49,21 @@ constexpr auto ANSI_Cyan = "\u001b[36m";
 constexpr auto ANSI_White = "\u001b[37m";
 constexpr auto ANSI_Reset = "\u001b[0m";
 
+using std::forward;
+using std::move;
+using std::tie;
+
 template <typename T>
 using Option = std::optional<T>;
 
 template <typename type_t, typename from_t>
 constexpr auto cast(from_t &&_in) {
-	return static_cast<type_t>(std::forward<from_t>(_in));
+	return static_cast<type_t>(forward<from_t>(_in));
 }
 
 template <typename type_t, typename from_t>
 constexpr auto recast(from_t &&_in) {
-	return reinterpret_cast<type_t>(std::forward<from_t>(_in));
+	return reinterpret_cast<type_t>(forward<from_t>(_in));
 }
 
 constexpr f32 operator""_deg(long double degrees) {

aster/context.cpp

@@ -37,7 +37,7 @@ void Context::init(const std::string_view &_app_name, const Version &_app_versio
 		.applicationVersion = VK_MAKE_VERSION(_app_version.major, _app_version.minor, _app_version.patch),
 		.pEngineName = PROJECT_NAME,
 		.engineVersion = VK_MAKE_VERSION(VERSION.major, VERSION.minor, VERSION.patch),
-		.apiVersion = ASTER_API_VERSION,
+		.apiVersion = VK_API_VERSION_1_2,
 	};
 
 	vk::DebugUtilsMessengerCreateInfoEXT debug_messenger_create_info = {

aster/device.cpp

@@ -1,80 +0,0 @@
-// =============================================
-//  Aster: device.h
-//  Copyright (c) 2020-2024 Anish Bhobe
-// =============================================
-
-#include "device.h"
-
-Device::Device(const Context *_context, PhysicalDevice &&_physical_device, const vk::PhysicalDeviceFeatures *_enabled_features, const std::vector<QueueAllocation> &_queue_allocation, std::optional<std::string> _name) :
-		physical_device{ std::move(_physical_device) },
-		name{ std::move(_name) } {
-	std::vector<vk::DeviceQueueCreateInfo> queue_create_infos;
-	queue_create_infos.reserve(_queue_allocation.size());
-
-	u32 num_priorities = 0;
-	for (auto [_, count] : _queue_allocation) {
-		num_priorities = std::max(count, num_priorities);
-	}
-	std::vector priorities(num_priorities, 1.0f);
-
-	for (auto [family, count] : _queue_allocation) {
-		queue_create_infos.push_back({
-				.queueFamilyIndex = family,
-				.queueCount = count,
-				.pQueuePriorities = priorities.data(),
-		});
-	}
-
-	try {
-		device = physical_device.device.createDevice({
-				.queueCreateInfoCount = cast<u32>(queue_create_infos.size()),
-				.pQueueCreateInfos = queue_create_infos.data(),
-				.enabledLayerCount = _context->enable_validation_layers ? cast<u32>(_context->validation_layers.size()) : 0,
-				.ppEnabledLayerNames = _context->enable_validation_layers ? _context->validation_layers.data() : nullptr,
-				.enabledExtensionCount = cast<u32>(_context->device_extensions.size()),
-				.ppEnabledExtensionNames = _context->device_extensions.data(),
-				.pEnabledFeatures = _enabled_features,
-		});
-	} catch (const std::exception &_err) {
-		ERROR("Could not initialize Vulkan Device. Cause: {}", _err.what());
-		throw;
-	}
-
-	INFO("{} ({}) Initialized!", name.value_or(DEFAULT_DEVICE_NAME), physical_device.properties.deviceName.data());
-
-	VmaVulkanFunctions vma_vulkan_functions = {
-		.vkGetInstanceProcAddr = vk::defaultDispatchLoaderDynamic.vkGetInstanceProcAddr,
-		.vkGetDeviceProcAddr = vk::defaultDispatchLoaderDynamic.vkGetDeviceProcAddr,
-	};
-
-	const VmaAllocatorCreateInfo vma_allocator_create_info = {
-		.flags = 0,
-		.physicalDevice = physical_device.device,
-		.device = device,
-		.pVulkanFunctions = &vma_vulkan_functions,
-		.instance = _context->instance,
-		.vulkanApiVersion = ASTER_API_VERSION,
-	};
-
-	const auto result = cast<vk::Result>(vmaCreateAllocator(&vma_allocator_create_info, &allocator));
-	if (failed(result)) {
-		device.destroy();
-		auto _err = fmt::format("Memory allocator creation failed. Cause: {}", to_string(result));
-		ERROR("{}", _err);
-		throw std::runtime_error(_err);
-	}
-	VERBOSE("Memory Allocator Created");
-
-	INFO("Created '{}' Successfully", name.value_or(DEFAULT_DEVICE_NAME));
-}
-
-Device::~Device() {
-	if (allocator) {
-		vmaDestroyAllocator(allocator);
-		allocator = nullptr;
-		VERBOSE("Memory Allocator Destroyed");
-	}
-	device.destroy();
-	INFO("Device '{}' Destroyed", name.value_or(DEFAULT_DEVICE_NAME));
-	name = std::nullopt;
-}

aster/device.h

@@ -1,27 +0,0 @@
-// =============================================
-//  Aster: device.h
-//  Copyright (c) 2020-2024 Anish Bhobe
-// =============================================
-
-#pragma once
-
-#include "global.h"
-#include "physical_device.h"
-
-constexpr std::string DEFAULT_DEVICE_NAME = "<Unnamed GPU>";
-
-struct QueueAllocation {
-	u32 family;
-	u32 count;
-};
-
-struct Device final {
-	vk::Device device;
-	PhysicalDevice physical_device;
-	VmaAllocator allocator { nullptr };
-	std::optional<std::string> name { nullptr };
-
-	Device(const Context *_context, PhysicalDevice &&_physical_device, const vk::PhysicalDeviceFeatures *_enabled_features, const std::vector<QueueAllocation> &_queue_allocation, std::optional<std::string> _name = std::nullopt);
-
-	~Device();
-};

aster/global.cpp

@@ -9,7 +9,7 @@
 #include <cstdio>
 
 #define VMA_IMPLEMENTATION
-#include <vk_mem_alloc.h>
+#include <vma/vk_mem_alloc.h>
 
 // NOTE: Vulkan Dispatch Loader Storage - Should only appear once.
 VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE

aster/global.h

@@ -18,8 +18,6 @@
 #include <vk_mem_alloc.h>
 #include <vulkan/vulkan.hpp>
 
-constexpr u32 ASTER_API_VERSION = vk::ApiVersion13;
-
 #define CODE_LOC " @ " __FILE__ ":" VULKAN_HPP_STRINGIFY(__LINE__)
 [[nodiscard]] inline bool failed(const vk::Result _result) {
 	return _result != vk::Result::eSuccess;

aster/logger.h

@@ -38,7 +38,6 @@ struct Logger {
 			return "[DEBUG]:";
 		if constexpr (LogLevel == LogType::eVerbose)
 			return "[VERB]: ";
-		return "";
 	}
 
 	template <LogType LogLevel>
@@ -53,13 +52,12 @@ struct Logger {
 			return ANSI_White;
 		if constexpr (LogLevel == LogType::eVerbose)
 			return ANSI_Blue;
-		return ANSI_White;
 	}
 
 	template <LogType LogLevel>
 	void log(const std::string_view &_message, const char *_loc, u32 _line) const {
 		if (cast<u32>(LogLevel) <= minimum_logging_level) {
-			fmt::println("{}{} {} {} at {}:{}{}", to_color_cstr<LogLevel>(), to_cstr<LogLevel>(), _message.data(), ANSI_Black, _loc, _line, ANSI_Reset);
+			fmt::println("{}{} {}{}| at {}:{}{}", to_color_cstr<LogLevel>(), to_cstr<LogLevel>(), _message.data(), ANSI_Black, _loc, _line, ANSI_Reset);
 		}
 #if !defined(NDEBUG)
 		if constexpr (LogLevel == LogType::eError) {
@@ -71,7 +69,7 @@ struct Logger {
 	template <LogType LogLevel>
 	void log_cond(const char *_expr_str, const std::string_view &_message, const char *_loc, u32 _line) const {
 		if (cast<u32>(LogLevel) <= minimum_logging_level) {
-			fmt::println("{}{} ({}) {} {} at {}:{}{}", to_color_cstr<LogLevel>(), to_cstr<LogLevel>(), _expr_str, _message.data(), ANSI_Black, _loc, _line, ANSI_Reset);
+			fmt::println("{}{} ({}) {}{}| at {}:{}{}", to_color_cstr<LogLevel>(), to_cstr<LogLevel>(), _expr_str, _message.data(), ANSI_Black, _loc, _line, ANSI_Reset);
 		}
 #if !defined(NDEBUG)
 		if constexpr (LogLevel == LogType::eError) {

triangle/aster.cpp

@@ -1,10 +1,9 @@
 #include "aster/constants.h"
-#include "aster/device.h"
 #include "aster/glfw_context.h"
 #include "aster/physical_device.h"
 #include "aster/window.h"
 
-constexpr QueueSupportFlags required_queue_support = QueueSupportFlags{} | QueueSupportFlagBits::eGraphics | QueueSupportFlagBits::eCompute | QueueSupportFlagBits::ePresent | QueueSupportFlagBits::eTransfer;
+constexpr QueueSupportFlags required_queue_support = QueueSupportFlags{} | QueueSupportFlagBits::eGraphics | QueueSupportFlagBits::eCompute | QueueSupportFlagBits::ePresent | QueueSupportFlagBits::eCompute;
 
 [[nodiscard]] bool is_suitable_device(const PhysicalDevice *_physical_device) {
 	const bool all_required_queues = std::ranges::any_of(_physical_device->queue_families, [](const auto &_qfp) {
@@ -29,35 +28,22 @@ PhysicalDevice find_suitable_device(const PhysicalDevices &_physical_devices) {
 	throw std::runtime_error("No suitable device found.");
 }
 
-QueueAllocation find_appropriate_queue_allocation(const PhysicalDevice* _physical_device) {
-	for (auto &_queue_info: _physical_device->queue_families) {
-		if ((_queue_info.support & required_queue_support) == required_queue_support) {
-			return {
-				.family = _queue_info.index,
-				.count = _queue_info.count,
-			};
-		}
-	}
-	throw std::runtime_error("No suitable queue family.");
-}
-
 int main(int, char **) {
-	GlfwContext glfw_context = {};
+	const auto *glfw = new GlfwContext();
-	Context context = {"Aster", VERSION};
+	auto *context = new Context("Aster", VERSION);
-	Window window = {"Aster1", &context, { 640, 480 }};
+	auto *window = new Window("Aster1", context, { 640, 480 });
 
-	PhysicalDevices physical_devices = { &window, &context };
+	PhysicalDevices physical_devices = { window, context };
 	PhysicalDevice device_to_use = find_suitable_device(physical_devices);
 
 	INFO("Using {} as the primary device.", device_to_use.properties.deviceName.data());
 
-	vk::PhysicalDeviceFeatures features = {};
+	while (window->poll()) {
-	QueueAllocation queue_allocation = find_appropriate_queue_allocation(&device_to_use);
-
-	Device device = { &context, std::move(device_to_use), &features, {queue_allocation}, "Primary Device" };
-
-	while (window.poll()) {
 	}
 
+	delete window;
+	delete context;
+	delete glfw;
+
 	return 0;
 }