From d68360173fa9037f5433dc25e17a718cc5303638 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Tue, 16 Jun 2026 19:32:20 +0200 Subject: [PATCH] renaming intel driver to Flint --- .gitea/workflows/Build.yml | 8 +- .gitea/workflows/Test.yml | 8 +- build.zig | 10 +- ...Semaphore.zig => FlintBinarySemaphore.zig} | 0 .../{IntelBuffer.zig => FlintBuffer.zig} | 0 ...ntelBufferView.zig => FlintBufferView.zig} | 0 ...mmandBuffer.zig => FlintCommandBuffer.zig} | 0 ...elCommandPool.zig => FlintCommandPool.zig} | 4 +- ...riptorPool.zig => FlintDescriptorPool.zig} | 2 - ...scriptorSet.zig => FlintDescriptorSet.zig} | 1 - ...ayout.zig => FlintDescriptorSetLayout.zig} | 0 .../{IntelDevice.zig => FlintDevice.zig} | 88 +++++++------- ...DeviceMemory.zig => FlintDeviceMemory.zig} | 5 +- src/intel/{IntelEvent.zig => FlintEvent.zig} | 0 src/intel/{IntelFence.zig => FlintFence.zig} | 0 ...elFramebuffer.zig => FlintFramebuffer.zig} | 1 - src/intel/{IntelImage.zig => FlintImage.zig} | 3 +- ...{IntelImageView.zig => FlintImageView.zig} | 0 .../{IntelInstance.zig => FlintInstance.zig} | 4 +- ...icalDevice.zig => FlintPhysicalDevice.zig} | 53 ++------ .../{IntelPipeline.zig => FlintPipeline.zig} | 0 ...pelineCache.zig => FlintPipelineCache.zig} | 0 ...lineLayout.zig => FlintPipelineLayout.zig} | 0 ...{IntelQueryPool.zig => FlintQueryPool.zig} | 0 src/intel/{IntelQueue.zig => FlintQueue.zig} | 4 +- ...ntelRenderPass.zig => FlintRenderPass.zig} | 0 .../{IntelSampler.zig => FlintSampler.zig} | 0 ...ShaderModule.zig => FlintShaderModule.zig} | 0 src/intel/lib.zig | 114 +++++++++--------- src/software/lib.zig | 1 - 30 files changed, 137 insertions(+), 169 deletions(-) rename src/intel/{IntelBinarySemaphore.zig => FlintBinarySemaphore.zig} (100%) rename src/intel/{IntelBuffer.zig => FlintBuffer.zig} (100%) rename src/intel/{IntelBufferView.zig => FlintBufferView.zig} (100%) rename src/intel/{IntelCommandBuffer.zig => FlintCommandBuffer.zig} (100%) rename src/intel/{IntelCommandPool.zig => FlintCommandPool.zig} (91%) rename src/intel/{IntelDescriptorPool.zig => FlintDescriptorPool.zig} (96%) rename src/intel/{IntelDescriptorSet.zig => FlintDescriptorSet.zig} (97%) rename src/intel/{IntelDescriptorSetLayout.zig => FlintDescriptorSetLayout.zig} (100%) rename src/intel/{IntelDevice.zig => FlintDevice.zig} (72%) rename src/intel/{IntelDeviceMemory.zig => FlintDeviceMemory.zig} (93%) rename src/intel/{IntelEvent.zig => FlintEvent.zig} (100%) rename src/intel/{IntelFence.zig => FlintFence.zig} (100%) rename src/intel/{IntelFramebuffer.zig => FlintFramebuffer.zig} (93%) rename src/intel/{IntelImage.zig => FlintImage.zig} (96%) rename src/intel/{IntelImageView.zig => FlintImageView.zig} (100%) rename src/intel/{IntelInstance.zig => FlintInstance.zig} (91%) rename src/intel/{IntelPhysicalDevice.zig => FlintPhysicalDevice.zig} (92%) rename src/intel/{IntelPipeline.zig => FlintPipeline.zig} (100%) rename src/intel/{IntelPipelineCache.zig => FlintPipelineCache.zig} (100%) rename src/intel/{IntelPipelineLayout.zig => FlintPipelineLayout.zig} (100%) rename src/intel/{IntelQueryPool.zig => FlintQueryPool.zig} (100%) rename src/intel/{IntelQueue.zig => FlintQueue.zig} (93%) rename src/intel/{IntelRenderPass.zig => FlintRenderPass.zig} (100%) rename src/intel/{IntelSampler.zig => FlintSampler.zig} (100%) rename src/intel/{IntelShaderModule.zig => FlintShaderModule.zig} (100%) diff --git a/.gitea/workflows/Build.yml b/.gitea/workflows/Build.yml index 33e23cb..221fb9e 100644 --- a/.gitea/workflows/Build.yml +++ b/.gitea/workflows/Build.yml @@ -18,9 +18,15 @@ jobs: - uses: https://codeberg.org/mlugg/setup-zig@v2 - - name: Building + - name: Building Ape + run: zig build ape + + - name: Building Soft run: zig build soft + - name: Building Flint + run: zig build flint + - name: Generating docs run: zig build docs diff --git a/.gitea/workflows/Test.yml b/.gitea/workflows/Test.yml index 01c4ede..9fafbee 100644 --- a/.gitea/workflows/Test.yml +++ b/.gitea/workflows/Test.yml @@ -15,5 +15,11 @@ jobs: - uses: actions/checkout@v4 - uses: https://codeberg.org/mlugg/setup-zig@v2 - - name: Zig Tests + - name: Ape Tests + run: zig build test-ape + + - name: Soft Tests run: zig build test-soft + + - name: Flint Tests + run: zig build test-flint diff --git a/build.zig b/build.zig index 5396ac5..a0bf912 100644 --- a/build.zig +++ b/build.zig @@ -39,11 +39,11 @@ const implementations = [_]ImplementationDesc{ .options = optionsSoft, }, .{ - .name = "intel", + .name = "flint", .root_source_file = "src/intel/lib.zig", .vulkan_version = .{ .major = 1, .minor = 0, .patch = 0 }, - .custom = customIntel, - .options = optionsIntel, + .custom = customFlint, + .options = optionsFlint, }, }; @@ -277,7 +277,7 @@ fn optionsSoft(b: *std.Build, options: *Step.Options) !void { options.addOption(bool, "soft_approximates_rgb", approxiamte_rgb_option); } -fn customIntel( +fn customFlint( _: *std.Build, _: *Step.Compile, lib_mod: *std.Build.Module, @@ -291,7 +291,7 @@ fn customIntel( lib_mod.addImport("intel_c", base_c_mod); } -fn optionsIntel(b: *std.Build, options: *Step.Options) !void { +fn optionsFlint(b: *std.Build, options: *Step.Options) !void { _ = b; _ = options; } diff --git a/src/intel/IntelBinarySemaphore.zig b/src/intel/FlintBinarySemaphore.zig similarity index 100% rename from src/intel/IntelBinarySemaphore.zig rename to src/intel/FlintBinarySemaphore.zig diff --git a/src/intel/IntelBuffer.zig b/src/intel/FlintBuffer.zig similarity index 100% rename from src/intel/IntelBuffer.zig rename to src/intel/FlintBuffer.zig diff --git a/src/intel/IntelBufferView.zig b/src/intel/FlintBufferView.zig similarity index 100% rename from src/intel/IntelBufferView.zig rename to src/intel/FlintBufferView.zig diff --git a/src/intel/IntelCommandBuffer.zig b/src/intel/FlintCommandBuffer.zig similarity index 100% rename from src/intel/IntelCommandBuffer.zig rename to src/intel/FlintCommandBuffer.zig diff --git a/src/intel/IntelCommandPool.zig b/src/intel/FlintCommandPool.zig similarity index 91% rename from src/intel/IntelCommandPool.zig rename to src/intel/FlintCommandPool.zig index bf5b86d..f44b947 100644 --- a/src/intel/IntelCommandPool.zig +++ b/src/intel/FlintCommandPool.zig @@ -6,7 +6,7 @@ const NonDispatchable = base.NonDispatchable; const VkError = base.VkError; const Device = base.Device; -const IntelCommandBuffer = @import("IntelCommandBuffer.zig"); +const FlintCommandBuffer = @import("FlintCommandBuffer.zig"); const Self = @This(); pub const Interface = base.CommandPool; @@ -32,7 +32,7 @@ pub fn create(device: *base.Device, allocator: std.mem.Allocator, info: *const v } pub fn createCommandBuffer(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.CommandBufferAllocateInfo) VkError!*base.CommandBuffer { - const cmd = try IntelCommandBuffer.create(interface.owner, allocator, info); + const cmd = try FlintCommandBuffer.create(interface.owner, allocator, info); return &cmd.interface; } diff --git a/src/intel/IntelDescriptorPool.zig b/src/intel/FlintDescriptorPool.zig similarity index 96% rename from src/intel/IntelDescriptorPool.zig rename to src/intel/FlintDescriptorPool.zig index 8369e0d..c390577 100644 --- a/src/intel/IntelDescriptorPool.zig +++ b/src/intel/FlintDescriptorPool.zig @@ -7,8 +7,6 @@ const VulkanAllocator = base.VulkanAllocator; const Device = base.Device; -const IntelDescriptorSet = @import("IntelDescriptorSet.zig"); - const Self = @This(); pub const Interface = base.DescriptorPool; diff --git a/src/intel/IntelDescriptorSet.zig b/src/intel/FlintDescriptorSet.zig similarity index 97% rename from src/intel/IntelDescriptorSet.zig rename to src/intel/FlintDescriptorSet.zig index 42c3e06..7472fb9 100644 --- a/src/intel/IntelDescriptorSet.zig +++ b/src/intel/FlintDescriptorSet.zig @@ -29,7 +29,6 @@ pub fn create(device: *base.Device, allocator: std.mem.Allocator, layout: *base. pub fn destroy(interface: *Interface, allocator: std.mem.Allocator) void { const self: *Self = @alignCast(@fieldParentPtr("interface", interface)); - allocator.free(self.heap); allocator.destroy(self); } diff --git a/src/intel/IntelDescriptorSetLayout.zig b/src/intel/FlintDescriptorSetLayout.zig similarity index 100% rename from src/intel/IntelDescriptorSetLayout.zig rename to src/intel/FlintDescriptorSetLayout.zig diff --git a/src/intel/IntelDevice.zig b/src/intel/FlintDevice.zig similarity index 72% rename from src/intel/IntelDevice.zig rename to src/intel/FlintDevice.zig index 8fd68ed..7988704 100644 --- a/src/intel/IntelDevice.zig +++ b/src/intel/FlintDevice.zig @@ -2,29 +2,29 @@ const std = @import("std"); const vk = @import("vulkan"); const base = @import("base"); -const IntelQueue = @import("IntelQueue.zig"); +const FlintQueue = @import("FlintQueue.zig"); -pub const IntelBinarySemaphore = @import("IntelBinarySemaphore.zig"); -pub const IntelBuffer = @import("IntelBuffer.zig"); -pub const IntelBufferView = @import("IntelBufferView.zig"); -pub const IntelCommandBuffer = @import("IntelCommandBuffer.zig"); -pub const IntelCommandPool = @import("IntelCommandPool.zig"); -pub const IntelDescriptorPool = @import("IntelDescriptorPool.zig"); -pub const IntelDescriptorSetLayout = @import("IntelDescriptorSetLayout.zig"); -pub const IntelDeviceMemory = @import("IntelDeviceMemory.zig"); -pub const IntelEvent = @import("IntelEvent.zig"); -pub const IntelFence = @import("IntelFence.zig"); -pub const IntelFramebuffer = @import("IntelFramebuffer.zig"); -pub const IntelImage = @import("IntelImage.zig"); -pub const IntelInstance = @import("IntelInstance.zig"); -pub const IntelImageView = @import("IntelImageView.zig"); -pub const IntelPipeline = @import("IntelPipeline.zig"); -pub const IntelPipelineCache = @import("IntelPipelineCache.zig"); -pub const IntelPipelineLayout = @import("IntelPipelineLayout.zig"); -pub const IntelQueryPool = @import("IntelQueryPool.zig"); -pub const IntelRenderPass = @import("IntelRenderPass.zig"); -pub const IntelSampler = @import("IntelSampler.zig"); -pub const IntelShaderModule = @import("IntelShaderModule.zig"); +pub const FlintBinarySemaphore = @import("FlintBinarySemaphore.zig"); +pub const FlintBuffer = @import("FlintBuffer.zig"); +pub const FlintBufferView = @import("FlintBufferView.zig"); +pub const FlintCommandBuffer = @import("FlintCommandBuffer.zig"); +pub const FlintCommandPool = @import("FlintCommandPool.zig"); +pub const FlintDescriptorPool = @import("FlintDescriptorPool.zig"); +pub const FlintDescriptorSetLayout = @import("FlintDescriptorSetLayout.zig"); +pub const FlintDeviceMemory = @import("FlintDeviceMemory.zig"); +pub const FlintEvent = @import("FlintEvent.zig"); +pub const FlintFence = @import("FlintFence.zig"); +pub const FlintFramebuffer = @import("FlintFramebuffer.zig"); +pub const FlintImage = @import("FlintImage.zig"); +pub const FlintInstance = @import("FlintInstance.zig"); +pub const FlintImageView = @import("FlintImageView.zig"); +pub const FlintPipeline = @import("FlintPipeline.zig"); +pub const FlintPipelineCache = @import("FlintPipelineCache.zig"); +pub const FlintPipelineLayout = @import("FlintPipelineLayout.zig"); +pub const FlintQueryPool = @import("FlintQueryPool.zig"); +pub const FlintRenderPass = @import("FlintRenderPass.zig"); +pub const FlintSampler = @import("FlintSampler.zig"); +pub const FlintShaderModule = @import("FlintShaderModule.zig"); const VkError = base.VkError; @@ -40,8 +40,8 @@ pub fn create(instance: *base.Instance, physical_device: *base.PhysicalDevice, a var interface = try Interface.init(allocator, instance, physical_device, info); interface.vtable = &.{ - .createQueue = IntelQueue.create, - .destroyQueue = IntelQueue.destroy, + .createQueue = FlintQueue.create, + .destroyQueue = FlintQueue.destroy, }; interface.dispatch_table = &.{ @@ -86,102 +86,102 @@ pub fn destroy(interface: *Interface, allocator: std.mem.Allocator) VkError!void pub fn allocateMemory(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.MemoryAllocateInfo) VkError!*base.DeviceMemory { const self: *Self = @alignCast(@fieldParentPtr("interface", interface)); - const device_memory = try IntelDeviceMemory.create(self, allocator, info.allocation_size, info.memory_type_index); + const device_memory = try FlintDeviceMemory.create(self, allocator, info.allocation_size, info.memory_type_index); return &device_memory.interface; } pub fn createBuffer(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.BufferCreateInfo) VkError!*base.Buffer { - const buffer = try IntelBuffer.create(interface, allocator, info); + const buffer = try FlintBuffer.create(interface, allocator, info); return &buffer.interface; } pub fn createDescriptorPool(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.DescriptorPoolCreateInfo) VkError!*base.DescriptorPool { - const pool = try IntelDescriptorPool.create(interface, allocator, info); + const pool = try FlintDescriptorPool.create(interface, allocator, info); return &pool.interface; } pub fn createDescriptorSetLayout(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.DescriptorSetLayoutCreateInfo) VkError!*base.DescriptorSetLayout { - const layout = try IntelDescriptorSetLayout.create(interface, allocator, info); + const layout = try FlintDescriptorSetLayout.create(interface, allocator, info); return &layout.interface; } pub fn createFence(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.FenceCreateInfo) VkError!*base.Fence { - const fence = try IntelFence.create(interface, allocator, info); + const fence = try FlintFence.create(interface, allocator, info); return &fence.interface; } pub fn createCommandPool(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.CommandPoolCreateInfo) VkError!*base.CommandPool { - const pool = try IntelCommandPool.create(interface, allocator, info); + const pool = try FlintCommandPool.create(interface, allocator, info); return &pool.interface; } pub fn createImage(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.ImageCreateInfo) VkError!*base.Image { - const image = try IntelImage.create(interface, allocator, info); + const image = try FlintImage.create(interface, allocator, info); return &image.interface; } pub fn createImageView(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.ImageViewCreateInfo) VkError!*base.ImageView { - const view = try IntelImageView.create(interface, allocator, info); + const view = try FlintImageView.create(interface, allocator, info); return &view.interface; } pub fn createBufferView(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.BufferViewCreateInfo) VkError!*base.BufferView { - const view = try IntelBufferView.create(interface, allocator, info); + const view = try FlintBufferView.create(interface, allocator, info); return &view.interface; } pub fn createComputePipeline(interface: *Interface, allocator: std.mem.Allocator, cache: ?*base.PipelineCache, info: *const vk.ComputePipelineCreateInfo) VkError!*base.Pipeline { - const pipeline = try IntelPipeline.createCompute(interface, allocator, cache, info); + const pipeline = try FlintPipeline.createCompute(interface, allocator, cache, info); return &pipeline.interface; } pub fn createEvent(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.EventCreateInfo) VkError!*base.Event { - const event = try IntelEvent.create(interface, allocator, info); + const event = try FlintEvent.create(interface, allocator, info); return &event.interface; } pub fn createFramebuffer(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.FramebufferCreateInfo) VkError!*base.Framebuffer { - const framebuffer = try IntelFramebuffer.create(interface, allocator, info); + const framebuffer = try FlintFramebuffer.create(interface, allocator, info); return &framebuffer.interface; } pub fn createGraphicsPipeline(interface: *Interface, allocator: std.mem.Allocator, cache: ?*base.PipelineCache, info: *const vk.GraphicsPipelineCreateInfo) VkError!*base.Pipeline { - const pipeline = try IntelPipeline.createGraphics(interface, allocator, cache, info); + const pipeline = try FlintPipeline.createGraphics(interface, allocator, cache, info); return &pipeline.interface; } pub fn createPipelineCache(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.PipelineCacheCreateInfo) VkError!*base.PipelineCache { - const cache = try IntelPipelineCache.create(interface, allocator, info); + const cache = try FlintPipelineCache.create(interface, allocator, info); return &cache.interface; } pub fn createPipelineLayout(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.PipelineLayoutCreateInfo) VkError!*base.PipelineLayout { - const layout = try IntelPipelineLayout.create(interface, allocator, info); + const layout = try FlintPipelineLayout.create(interface, allocator, info); return &layout.interface; } pub fn createQueryPool(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.QueryPoolCreateInfo) VkError!*base.QueryPool { - const pool = try IntelQueryPool.create(interface, allocator, info); + const pool = try FlintQueryPool.create(interface, allocator, info); return &pool.interface; } pub fn createRenderPass(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.RenderPassCreateInfo) VkError!*base.RenderPass { - const pass = try IntelRenderPass.create(interface, allocator, info); + const pass = try FlintRenderPass.create(interface, allocator, info); return &pass.interface; } pub fn createSampler(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.SamplerCreateInfo) VkError!*base.Sampler { - const sampler = try IntelSampler.create(interface, allocator, info); + const sampler = try FlintSampler.create(interface, allocator, info); return &sampler.interface; } pub fn createSemaphore(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.SemaphoreCreateInfo) VkError!*base.BinarySemaphore { - const semaphore = try IntelBinarySemaphore.create(interface, allocator, info); + const semaphore = try FlintBinarySemaphore.create(interface, allocator, info); return &semaphore.interface; } pub fn createShaderModule(interface: *Interface, allocator: std.mem.Allocator, info: *const vk.ShaderModuleCreateInfo) VkError!*base.ShaderModule { - const module = try IntelShaderModule.create(interface, allocator, info); + const module = try FlintShaderModule.create(interface, allocator, info); return &module.interface; } diff --git a/src/intel/IntelDeviceMemory.zig b/src/intel/FlintDeviceMemory.zig similarity index 93% rename from src/intel/IntelDeviceMemory.zig rename to src/intel/FlintDeviceMemory.zig index 89d8f22..edbeba9 100644 --- a/src/intel/IntelDeviceMemory.zig +++ b/src/intel/FlintDeviceMemory.zig @@ -1,9 +1,10 @@ const std = @import("std"); const vk = @import("vulkan"); -const IntelDevice = @import("IntelDevice.zig"); const base = @import("base"); const lib = @import("lib.zig"); +const FlintDevice = @import("FlintDevice.zig"); + const VkError = base.VkError; const Self = @This(); @@ -11,7 +12,7 @@ pub const Interface = base.DeviceMemory; interface: Interface, -pub fn create(device: *IntelDevice, allocator: std.mem.Allocator, size: vk.DeviceSize, memory_type_index: u32) VkError!*Self { +pub fn create(device: *FlintDevice, allocator: std.mem.Allocator, size: vk.DeviceSize, memory_type_index: u32) VkError!*Self { const self = allocator.create(Self) catch return VkError.OutOfHostMemory; errdefer allocator.destroy(self); diff --git a/src/intel/IntelEvent.zig b/src/intel/FlintEvent.zig similarity index 100% rename from src/intel/IntelEvent.zig rename to src/intel/FlintEvent.zig diff --git a/src/intel/IntelFence.zig b/src/intel/FlintFence.zig similarity index 100% rename from src/intel/IntelFence.zig rename to src/intel/FlintFence.zig diff --git a/src/intel/IntelFramebuffer.zig b/src/intel/FlintFramebuffer.zig similarity index 93% rename from src/intel/IntelFramebuffer.zig rename to src/intel/FlintFramebuffer.zig index ac43a94..7c9e5d3 100644 --- a/src/intel/IntelFramebuffer.zig +++ b/src/intel/FlintFramebuffer.zig @@ -3,7 +3,6 @@ const vk = @import("vulkan"); const base = @import("base"); const VkError = base.VkError; -const IntelRenderPass = @import("IntelRenderPass.zig"); const Self = @This(); pub const Interface = base.Framebuffer; diff --git a/src/intel/IntelImage.zig b/src/intel/FlintImage.zig similarity index 96% rename from src/intel/IntelImage.zig rename to src/intel/FlintImage.zig index 57624e2..4c65234 100644 --- a/src/intel/IntelImage.zig +++ b/src/intel/FlintImage.zig @@ -4,7 +4,6 @@ const base = @import("base"); const lib = @import("lib.zig"); const VkError = base.VkError; -const IntelBuffer = @import("IntelBuffer.zig"); const Self = @This(); pub const Interface = base.Image; @@ -41,7 +40,7 @@ pub fn destroy(interface: *Interface, allocator: std.mem.Allocator) void { } pub fn getMemoryRequirements(_: *Interface, requirements: *vk.MemoryRequirements) VkError!void { - requirements.alignment = lib.MEMORY_REQUIREMENTS_IMAGE_ALIGNMENT; + _ = requirements; } pub fn copyToMemory(interface: *const Interface, memory: []u8, subresource: vk.ImageSubresourceLayers) VkError!void { diff --git a/src/intel/IntelImageView.zig b/src/intel/FlintImageView.zig similarity index 100% rename from src/intel/IntelImageView.zig rename to src/intel/FlintImageView.zig diff --git a/src/intel/IntelInstance.zig b/src/intel/FlintInstance.zig similarity index 91% rename from src/intel/IntelInstance.zig rename to src/intel/FlintInstance.zig index c813713..8b7224e 100644 --- a/src/intel/IntelInstance.zig +++ b/src/intel/FlintInstance.zig @@ -1,7 +1,7 @@ const std = @import("std"); const vk = @import("vulkan"); const base = @import("base"); -const IntelPhysicalDevice = @import("IntelPhysicalDevice.zig"); +const FlintPhysicalDevice = @import("FlintPhysicalDevice.zig"); const Dispatchable = base.Dispatchable; @@ -36,7 +36,7 @@ pub fn create(allocator: std.mem.Allocator, infos: *const vk.InstanceCreateInfo) errdefer allocator.destroy(self); self.allocator = std.heap.smp_allocator; - self.threaded = if (comptime base.config.intel_single_threaded) .init_single_threaded else std.Io.Threaded.init(self.allocator, .{}); + self.threaded = std.Io.Threaded.init(self.allocator, .{}); self.io_impl = self.threaded.io(); self.interface = try base.Instance.init(allocator, infos); diff --git a/src/intel/IntelPhysicalDevice.zig b/src/intel/FlintPhysicalDevice.zig similarity index 92% rename from src/intel/IntelPhysicalDevice.zig rename to src/intel/FlintPhysicalDevice.zig index bcfd7da..be6bb51 100644 --- a/src/intel/IntelPhysicalDevice.zig +++ b/src/intel/FlintPhysicalDevice.zig @@ -4,7 +4,7 @@ const vk = @import("vulkan"); const base = @import("base"); const lib = @import("lib.zig"); -const IntelDevice = @import("IntelDevice.zig"); +const FlintDevice = @import("FlintDevice.zig"); const VkError = base.VkError; const VulkanAllocator = base.VulkanAllocator; @@ -211,7 +211,7 @@ pub fn destroy(interface: *Interface, allocator: std.mem.Allocator) VkError!void } pub fn createDevice(interface: *Interface, allocator: std.mem.Allocator, infos: *const vk.DeviceCreateInfo) VkError!*base.Device { - const device = try IntelDevice.create(interface.instance, interface, allocator, infos); + const device = try FlintDevice.create(interface.instance, interface, allocator, infos); return &device.interface; } @@ -664,63 +664,24 @@ pub fn getImageFormatProperties( image_type: vk.ImageType, tiling: vk.ImageTiling, usage: vk.ImageUsageFlags, - flags: vk.ImageCreateFlags, + _: vk.ImageCreateFlags, ) VkError!vk.ImageFormatProperties { const self: *Self = @alignCast(@fieldParentPtr("interface", interface)); if (!try self.isFormatSupported(format, image_type, tiling, usage)) return VkError.FormatNotSupported; - var properties: vk.ImageFormatProperties = .{ + const properties: vk.ImageFormatProperties = .{ .max_extent = .{ .width = 0, .height = 0, .depth = 1 }, .max_mip_levels = 1, - .max_array_layers = lib.MAX_IMAGE_ARRAY_LAYERS, + .max_array_layers = 1, .sample_counts = .{ .@"1_bit" = true }, .max_resource_size = std.math.maxInt(u32), }; - switch (image_type) { - .@"1d" => { - properties.max_mip_levels = lib.MAX_IMAGE_LEVELS_1D; - properties.max_extent.width = 1 << (lib.MAX_IMAGE_LEVELS_1D - 1); - properties.max_extent.height = 1; - }, - .@"2d" => { - if (flags.cube_compatible_bit) { - properties.max_mip_levels = lib.MAX_IMAGE_LEVELS_CUBE; - properties.max_extent.width = 1 << (lib.MAX_IMAGE_LEVELS_CUBE - 1); - properties.max_extent.height = 1 << (lib.MAX_IMAGE_LEVELS_CUBE - 1); - } else { - properties.max_mip_levels = lib.MAX_IMAGE_LEVELS_2D; - properties.max_extent.width = 1 << (lib.MAX_IMAGE_LEVELS_2D - 1); - properties.max_extent.height = 1 << (lib.MAX_IMAGE_LEVELS_2D - 1); - - const format_properties = try interface.getFormatProperties(format); - const format_features = if (tiling == .linear) format_properties.linear_tiling_features else format_properties.optimal_tiling_features; - if (format_features.color_attachment_bit or format_features.depth_stencil_attachment_bit) { - properties.sample_counts = .{ .@"1_bit" = true, .@"4_bit" = true }; - } - } - }, - .@"3d" => { - properties.max_mip_levels = lib.MAX_IMAGE_LEVELS_3D; - properties.max_extent.width = 1 << (lib.MAX_IMAGE_LEVELS_3D - 1); - properties.max_extent.height = 1 << (lib.MAX_IMAGE_LEVELS_3D - 1); - properties.max_extent.depth = 1 << (lib.MAX_IMAGE_LEVELS_3D - 1); - properties.max_array_layers = 1; - }, - else => return VkError.FormatNotSupported, - } - - if (tiling == .linear) { - properties.max_mip_levels = 1; - properties.max_array_layers = 1; - properties.sample_counts = .{ .@"1_bit" = true }; - } - return properties; } -/// Intel does not support sparse images. +/// Flint does not support sparse images. pub fn getSparseImageFormatProperties( interface: *Interface, format: vk.Format, @@ -740,7 +701,7 @@ pub fn getSparseImageFormatProperties( return 0; } -/// Intel does not support sparse images. +/// Flint does not support sparse images. pub fn getSparseImageFormatProperties2( interface: *Interface, format: vk.Format, diff --git a/src/intel/IntelPipeline.zig b/src/intel/FlintPipeline.zig similarity index 100% rename from src/intel/IntelPipeline.zig rename to src/intel/FlintPipeline.zig diff --git a/src/intel/IntelPipelineCache.zig b/src/intel/FlintPipelineCache.zig similarity index 100% rename from src/intel/IntelPipelineCache.zig rename to src/intel/FlintPipelineCache.zig diff --git a/src/intel/IntelPipelineLayout.zig b/src/intel/FlintPipelineLayout.zig similarity index 100% rename from src/intel/IntelPipelineLayout.zig rename to src/intel/FlintPipelineLayout.zig diff --git a/src/intel/IntelQueryPool.zig b/src/intel/FlintQueryPool.zig similarity index 100% rename from src/intel/IntelQueryPool.zig rename to src/intel/FlintQueryPool.zig diff --git a/src/intel/IntelQueue.zig b/src/intel/FlintQueue.zig similarity index 93% rename from src/intel/IntelQueue.zig rename to src/intel/FlintQueue.zig index 26c0fbc..a7667b6 100644 --- a/src/intel/IntelQueue.zig +++ b/src/intel/FlintQueue.zig @@ -2,7 +2,7 @@ const std = @import("std"); const vk = @import("vulkan"); const base = @import("base"); -const IntelCommandBuffer = @import("IntelCommandBuffer.zig"); +const FlintCommandBuffer = @import("FlintCommandBuffer.zig"); const VkError = base.VkError; @@ -46,7 +46,7 @@ pub fn submit(interface: *Interface, infos: []Interface.SubmitInfo, fence: ?*bas } for (info.command_buffers.items) |command_buffer| { - const intel_command_buffer: *IntelCommandBuffer = @alignCast(@fieldParentPtr("interface", command_buffer)); + const intel_command_buffer: *FlintCommandBuffer = @alignCast(@fieldParentPtr("interface", command_buffer)); _ = intel_command_buffer; } diff --git a/src/intel/IntelRenderPass.zig b/src/intel/FlintRenderPass.zig similarity index 100% rename from src/intel/IntelRenderPass.zig rename to src/intel/FlintRenderPass.zig diff --git a/src/intel/IntelSampler.zig b/src/intel/FlintSampler.zig similarity index 100% rename from src/intel/IntelSampler.zig rename to src/intel/FlintSampler.zig diff --git a/src/intel/IntelShaderModule.zig b/src/intel/FlintShaderModule.zig similarity index 100% rename from src/intel/IntelShaderModule.zig rename to src/intel/FlintShaderModule.zig diff --git a/src/intel/lib.zig b/src/intel/lib.zig index a0795fe..968e9a5 100644 --- a/src/intel/lib.zig +++ b/src/intel/lib.zig @@ -5,48 +5,48 @@ pub const base = @import("base"); pub const c = @import("intel_c"); pub const config = base.config; -pub const IntelInstance = @import("IntelInstance.zig"); -pub const IntelDevice = @import("IntelDevice.zig"); -pub const IntelPhysicalDevice = @import("IntelPhysicalDevice.zig"); -pub const IntelQueue = @import("IntelQueue.zig"); +pub const FlintInstance = @import("FlintInstance.zig"); +pub const FlintDevice = @import("FlintDevice.zig"); +pub const FlintPhysicalDevice = @import("FlintPhysicalDevice.zig"); +pub const FlintQueue = @import("FlintQueue.zig"); -pub const IntelBinarySemaphore = @import("IntelBinarySemaphore.zig"); -pub const IntelBuffer = @import("IntelBuffer.zig"); -pub const IntelBufferView = @import("IntelBufferView.zig"); -pub const IntelCommandBuffer = @import("IntelCommandBuffer.zig"); -pub const IntelCommandPool = @import("IntelCommandPool.zig"); -pub const IntelDescriptorPool = @import("IntelDescriptorPool.zig"); -pub const IntelDescriptorSet = @import("IntelDescriptorSet.zig"); -pub const IntelDescriptorSetLayout = @import("IntelDescriptorSetLayout.zig"); -pub const IntelDeviceMemory = @import("IntelDeviceMemory.zig"); -pub const IntelEvent = @import("IntelEvent.zig"); -pub const IntelFence = @import("IntelFence.zig"); -pub const IntelFramebuffer = @import("IntelFramebuffer.zig"); -pub const IntelImage = @import("IntelImage.zig"); -pub const IntelImageView = @import("IntelImageView.zig"); -pub const IntelPipeline = @import("IntelPipeline.zig"); -pub const IntelPipelineCache = @import("IntelPipelineCache.zig"); -pub const IntelPipelineLayout = @import("IntelPipelineLayout.zig"); -pub const IntelQueryPool = @import("IntelQueryPool.zig"); -pub const IntelRenderPass = @import("IntelRenderPass.zig"); -pub const IntelSampler = @import("IntelSampler.zig"); -pub const IntelShaderModule = @import("IntelShaderModule.zig"); +pub const FlintBinarySemaphore = @import("FlintBinarySemaphore.zig"); +pub const FlintBuffer = @import("FlintBuffer.zig"); +pub const FlintBufferView = @import("FlintBufferView.zig"); +pub const FlintCommandBuffer = @import("FlintCommandBuffer.zig"); +pub const FlintCommandPool = @import("FlintCommandPool.zig"); +pub const FlintDescriptorPool = @import("FlintDescriptorPool.zig"); +pub const FlintDescriptorSet = @import("FlintDescriptorSet.zig"); +pub const FlintDescriptorSetLayout = @import("FlintDescriptorSetLayout.zig"); +pub const FlintDeviceMemory = @import("FlintDeviceMemory.zig"); +pub const FlintEvent = @import("FlintEvent.zig"); +pub const FlintFence = @import("FlintFence.zig"); +pub const FlintFramebuffer = @import("FlintFramebuffer.zig"); +pub const FlintImage = @import("FlintImage.zig"); +pub const FlintImageView = @import("FlintImageView.zig"); +pub const FlintPipeline = @import("FlintPipeline.zig"); +pub const FlintPipelineCache = @import("FlintPipelineCache.zig"); +pub const FlintPipelineLayout = @import("FlintPipelineLayout.zig"); +pub const FlintQueryPool = @import("FlintQueryPool.zig"); +pub const FlintRenderPass = @import("FlintRenderPass.zig"); +pub const FlintSampler = @import("FlintSampler.zig"); +pub const FlintShaderModule = @import("FlintShaderModule.zig"); -pub const Instance = IntelInstance; +pub const Instance = FlintInstance; -pub const DRIVER_NAME = "Intel"; +pub const DRIVER_NAME = "Flint"; pub const VULKAN_VERSION = vk.makeApiVersion( 0, - config.intel_vulkan_version.major, - config.intel_vulkan_version.minor, - config.intel_vulkan_version.patch, + config.flint_vulkan_version.major, + config.flint_vulkan_version.minor, + config.flint_vulkan_version.patch, ); pub const DEVICE_ID = 0x00000000; -pub const PIPELINE_CACHE_UUID: [vk.UUID_SIZE]u8 = "ApeIntelCacheUUI".*; +pub const PIPELINE_CACHE_UUID: [vk.UUID_SIZE]u8 = "ApeFlintCacheUUI".*; -pub const PHYSICAL_DEVICE_DEFAULT_NAME = "Ape Intel device"; +pub const PHYSICAL_DEVICE_DEFAULT_NAME = "Ape Flint device"; pub const std_options = base.std_options; @@ -55,30 +55,30 @@ comptime { } test { - std.testing.refAllDecls(IntelBinarySemaphore); - std.testing.refAllDecls(IntelBuffer); - std.testing.refAllDecls(IntelBufferView); - std.testing.refAllDecls(IntelCommandBuffer); - std.testing.refAllDecls(IntelCommandPool); - std.testing.refAllDecls(IntelDescriptorPool); - std.testing.refAllDecls(IntelDescriptorSet); - std.testing.refAllDecls(IntelDescriptorSetLayout); - std.testing.refAllDecls(IntelDevice); - std.testing.refAllDecls(IntelDeviceMemory); - std.testing.refAllDecls(IntelEvent); - std.testing.refAllDecls(IntelFence); - std.testing.refAllDecls(IntelFramebuffer); - std.testing.refAllDecls(IntelImage); - std.testing.refAllDecls(IntelImageView); - std.testing.refAllDecls(IntelInstance); - std.testing.refAllDecls(IntelPhysicalDevice); - std.testing.refAllDecls(IntelPipeline); - std.testing.refAllDecls(IntelPipelineCache); - std.testing.refAllDecls(IntelPipelineLayout); - std.testing.refAllDecls(IntelQueryPool); - std.testing.refAllDecls(IntelQueue); - std.testing.refAllDecls(IntelRenderPass); - std.testing.refAllDecls(IntelSampler); - std.testing.refAllDecls(IntelShaderModule); + std.testing.refAllDecls(FlintBinarySemaphore); + std.testing.refAllDecls(FlintBuffer); + std.testing.refAllDecls(FlintBufferView); + std.testing.refAllDecls(FlintCommandBuffer); + std.testing.refAllDecls(FlintCommandPool); + std.testing.refAllDecls(FlintDescriptorPool); + std.testing.refAllDecls(FlintDescriptorSet); + std.testing.refAllDecls(FlintDescriptorSetLayout); + std.testing.refAllDecls(FlintDevice); + std.testing.refAllDecls(FlintDeviceMemory); + std.testing.refAllDecls(FlintEvent); + std.testing.refAllDecls(FlintFence); + std.testing.refAllDecls(FlintFramebuffer); + std.testing.refAllDecls(FlintImage); + std.testing.refAllDecls(FlintImageView); + std.testing.refAllDecls(FlintInstance); + std.testing.refAllDecls(FlintPhysicalDevice); + std.testing.refAllDecls(FlintPipeline); + std.testing.refAllDecls(FlintPipelineCache); + std.testing.refAllDecls(FlintPipelineLayout); + std.testing.refAllDecls(FlintQueryPool); + std.testing.refAllDecls(FlintQueue); + std.testing.refAllDecls(FlintRenderPass); + std.testing.refAllDecls(FlintSampler); + std.testing.refAllDecls(FlintShaderModule); std.testing.refAllDecls(base); } diff --git a/src/software/lib.zig b/src/software/lib.zig index 89652c6..730acaa 100644 --- a/src/software/lib.zig +++ b/src/software/lib.zig @@ -36,7 +36,6 @@ pub const SoftShaderModule = @import("SoftShaderModule.zig"); pub const Instance = SoftInstance; -pub const DRIVER_LOGS_ENV_NAME = base.DRIVER_LOGS_ENV_NAME; pub const DRIVER_NAME = "Soft"; pub const VULKAN_VERSION = vk.makeApiVersion(