Skip to content

Commit

Permalink
CVulkan is now regular target instead of system library. Gives me mor…
Browse files Browse the repository at this point in the history
…e control
  • Loading branch information
smumriak committed Sep 11, 2023
1 parent 10f267e commit 9593aa4
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 30 deletions.
7 changes: 3 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -523,12 +523,11 @@ extension Target {
}

extension Target {
static let cVulkan: Target = systemLibrary(
static let cVulkan: Target = target(
name: "CVulkan",
path: "Volcano/Sources/CVulkan",
pkgConfig: "vulkan",
providers: [
.apt(["vulkan-sdk libwayland-dev libx11-dev"]),
linkerSettings: [
.linkedLibrary("vulkan"),
]
)
static let cClang: Target = systemLibrary(
Expand Down
8 changes: 8 additions & 0 deletions Volcano/Sources/CVulkan/CVulkanEmpty.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//
// CVulkanEmpty.c
// Volcano
//
// Created by Serhii Mumriak on 10.09.2023
//

#include "include/CVulkan.h"
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//
// CVulkan_umbrella.h
// CVulkan.h
// Volcano
//
//
// Created by Serhii Mumriak on 15.05.2020.
//

#ifndef CVulkan_umbrella_h
#define CVulkan_umbrella_h 1
#ifndef CVulkan_h
#define CVulkan_h 1

#if __linux__

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// WARNING: DO NOT MODIFY
// This file is generated by vkthings tool
// #*# Metadata version: 1
// #*# Date generated: '2023-07-01 06:13:39Z'
// #*# Vulkan Version: 1.3.250
// #*# Date generated: '2023-09-10 23:28:07Z'
// #*# Vulkan Version: 1.3.261
//
// VulkanEnums.h
// Volcano
Expand All @@ -13,7 +13,7 @@
#ifndef VulkanEnums_h
#define VulkanEnums_h 1

#include "../../../CCore/include/CCore.h"
#include "../../../../CCore/include/CCore.h"

AK_EXISTING_ENUM(VkAccelerationStructureBuildTypeKHR);
AK_EXISTING_ENUM(VkAccelerationStructureCompatibilityKHR);
Expand All @@ -34,13 +34,14 @@ AK_EXISTING_ENUM(VkColorSpaceKHR);
AK_EXISTING_ENUM(VkCommandBufferLevel);
AK_EXISTING_ENUM(VkCompareOp);
AK_EXISTING_ENUM(VkComponentSwizzle);
AK_EXISTING_ENUM(VkComponentTypeNV);
AK_EXISTING_ENUM(VkComponentTypeKHR);
AK_EXISTING_ENUM(VkConservativeRasterizationModeEXT);
AK_EXISTING_ENUM(VkCopyAccelerationStructureModeKHR);
AK_EXISTING_ENUM(VkCopyMicromapModeEXT);
AK_EXISTING_ENUM(VkCoverageModulationModeNV);
AK_EXISTING_ENUM(VkCoverageReductionModeNV);
AK_EXISTING_ENUM(VkDebugReportObjectTypeEXT);
AK_EXISTING_ENUM(VkDepthBiasRepresentationEXT);
AK_EXISTING_ENUM(VkDescriptorType);
AK_EXISTING_ENUM(VkDescriptorUpdateTemplateType);
AK_EXISTING_ENUM(VkDeviceAddressBindingTypeEXT);
Expand Down Expand Up @@ -111,7 +112,7 @@ AK_EXISTING_ENUM(VkSamplerMipmapMode);
AK_EXISTING_ENUM(VkSamplerReductionMode);
AK_EXISTING_ENUM(VkSamplerYcbcrModelConversion);
AK_EXISTING_ENUM(VkSamplerYcbcrRange);
AK_EXISTING_ENUM(VkScopeNV);
AK_EXISTING_ENUM(VkScopeKHR);
AK_EXISTING_ENUM(VkSemaphoreType);
AK_EXISTING_ENUM(VkShaderCodeTypeEXT);
AK_EXISTING_ENUM(VkShaderFloatControlsIndependence);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// WARNING: DO NOT MODIFY
// This file is generated by vkthings tool
// #*# Metadata version: 1
// #*# Date generated: '2023-07-01 06:13:42Z'
// #*# Vulkan Version: 1.3.250
// #*# Date generated: '2023-09-10 23:28:16Z'
// #*# Vulkan Version: 1.3.261
//
// VulkanOptionSets.h
// Volcano
Expand All @@ -13,13 +13,14 @@
#ifndef VulkanOptionSets_h
#define VulkanOptionSets_h 1

#include "../../../CCore/include/CCore.h"
#include "../../../../CCore/include/CCore.h"

AK_EXISTING_OPTIONS(VkAccelerationStructureCreateFlagBitsKHR);
AK_EXISTING_OPTIONS(VkAccessFlagBits);
AK_EXISTING_OPTIONS(VkAttachmentDescriptionFlagBits);
AK_EXISTING_OPTIONS(VkBufferCreateFlagBits);
AK_EXISTING_OPTIONS(VkBufferUsageFlagBits);
AK_EXISTING_OPTIONS(VkBufferUsageFlagBits2KHR);
AK_EXISTING_OPTIONS(VkBuildAccelerationStructureFlagBitsKHR);
AK_EXISTING_OPTIONS(VkBuildMicromapFlagBitsEXT);
AK_EXISTING_OPTIONS(VkColorComponentFlagBits);
Expand Down Expand Up @@ -61,6 +62,7 @@ AK_EXISTING_OPTIONS(VkFramebufferCreateFlagBits);
AK_EXISTING_OPTIONS(VkGeometryFlagBitsKHR);
AK_EXISTING_OPTIONS(VkGeometryInstanceFlagBitsKHR);
AK_EXISTING_OPTIONS(VkGraphicsPipelineLibraryFlagBitsEXT);
AK_EXISTING_OPTIONS(VkHostImageCopyFlagBitsEXT);
AK_EXISTING_OPTIONS(VkImageAspectFlagBits);
AK_EXISTING_OPTIONS(VkImageCompressionFixedRateFlagBitsEXT);
AK_EXISTING_OPTIONS(VkImageCompressionFlagBitsEXT);
Expand All @@ -83,6 +85,7 @@ AK_EXISTING_OPTIONS(VkPerformanceCounterDescriptionFlagBitsKHR);
AK_EXISTING_OPTIONS(VkPipelineCacheCreateFlagBits);
AK_EXISTING_OPTIONS(VkPipelineColorBlendStateCreateFlagBits);
AK_EXISTING_OPTIONS(VkPipelineCreateFlagBits);
AK_EXISTING_OPTIONS(VkPipelineCreateFlagBits2KHR);
AK_EXISTING_OPTIONS(VkPipelineCreationFeedbackFlagBits);
AK_EXISTING_OPTIONS(VkPipelineDepthStencilStateCreateFlagBits);
AK_EXISTING_OPTIONS(VkPipelineLayoutCreateFlagBits);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#ifndef VulkanStructs_h
#define VulkanStructs_h 1

#include "../../../CCore/include/CCore.h"
#include "../../../../CCore/include/CCore.h"

#ifndef __cplusplus

Expand Down
12 changes: 0 additions & 12 deletions Volcano/Sources/CVulkan/module.modulemap

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ AK_EXISTING_ENUM(VmaMemoryUsage);

#endif

#include "../../CVulkan/CVulkan_umbrella.h"
#include "../../CVulkan/include/CVulkan.h"
#include "VulkanMemoryAllocatorAdaptor.h"

#endif

0 comments on commit 9593aa4

Please sign in to comment.