From 01a3211dfb87e81c56634e89cb75d739ab18f694 Mon Sep 17 00:00:00 2001 From: Jorijn van der Graaf Date: Sat, 3 May 2025 02:34:38 +0200 Subject: [PATCH] shader fix --- Crafter.Graphics-VulkanTexture.cppm | 8 ++++---- Crafter.Graphics-WindowWaylandVulkan.cppm | 1 - Crafter.Graphics.cppm | 2 -- test2.frag => FragmentShaderSolidWhite.frag | 0 test.mesh => MeshShaderXYZ.mesh | 0 main.cpp | 4 ++-- project.json | 8 ++++---- 7 files changed, 10 insertions(+), 13 deletions(-) rename test2.frag => FragmentShaderSolidWhite.frag (100%) rename test.mesh => MeshShaderXYZ.mesh (100%) diff --git a/Crafter.Graphics-VulkanTexture.cppm b/Crafter.Graphics-VulkanTexture.cppm index bef7ca0..d0fca28 100644 --- a/Crafter.Graphics-VulkanTexture.cppm +++ b/Crafter.Graphics-VulkanTexture.cppm @@ -34,19 +34,19 @@ namespace Crafter { imageInfo.usage = usage; imageInfo.samples = VK_SAMPLE_COUNT_1_BIT; imageInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; - VulkanDevice::CHECK_VK_RESULT(vkCreateImage(device, &imageInfo, nullptr, &image)); + VulkanDevice::CHECK_VK_RESULT(vkCreateImage(VulkanDevice::device, &imageInfo, nullptr, &image)); VkMemoryRequirements memRequirements; - vkGetImageMemoryRequirements(device, image, &memRequirements); + vkGetImageMemoryRequirements(VulkanDevice::device, image, &memRequirements); VkMemoryAllocateInfo allocInfo{}; allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; allocInfo.allocationSize = memRequirements.size; allocInfo.memoryTypeIndex = findMemoryType(memRequirements.memoryTypeBits, properties); - VulkanDevice::CHECK_VK_RESULT(vkAllocateMemory(device, &allocInfo, nullptr, &imageMemory)); + VulkanDevice::CHECK_VK_RESULT(vkAllocateMemory(VulkanDevice::device, &allocInfo, nullptr, &imageMemory)); - vkBindImageMemory(device, image, imageMemory, 0); + vkBindImageMemory(VulkanDevice::device, image, imageMemory, 0); } }; } diff --git a/Crafter.Graphics-WindowWaylandVulkan.cppm b/Crafter.Graphics-WindowWaylandVulkan.cppm index 4565285..ed66995 100644 --- a/Crafter.Graphics-WindowWaylandVulkan.cppm +++ b/Crafter.Graphics-WindowWaylandVulkan.cppm @@ -10,7 +10,6 @@ module; export module Crafter.Graphics:WindowWaylandVulkan; import Crafter.Event; import :WindowWayland; -import :VulkanElement; import Crafter.Component; namespace Crafter { diff --git a/Crafter.Graphics.cppm b/Crafter.Graphics.cppm index 40cfb57..e188717 100644 --- a/Crafter.Graphics.cppm +++ b/Crafter.Graphics.cppm @@ -9,9 +9,7 @@ export import :Types; export import :VulkanDevice; export import :VulkanPipeline; export import :VulkanShader; -export import :VulkanElement; export import :Camera; -export import :VulkanElementFromPipeline; export import :VulkanBuffer; export import :Mesh; export import :MeshShader; \ No newline at end of file diff --git a/test2.frag b/FragmentShaderSolidWhite.frag similarity index 100% rename from test2.frag rename to FragmentShaderSolidWhite.frag diff --git a/test.mesh b/MeshShaderXYZ.mesh similarity index 100% rename from test.mesh rename to MeshShaderXYZ.mesh diff --git a/main.cpp b/main.cpp index 6070324..0b2bd53 100644 --- a/main.cpp +++ b/main.cpp @@ -14,8 +14,8 @@ import Crafter.Asset; import Crafter.Event; using namespace Crafter; -typedef VulkanShader<"test.spirv", "main", VK_SHADER_STAGE_MESH_BIT_EXT, 3, {{{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2}}}> MeshVulkanShader; -typedef VulkanShader<"test2.spirv", "main", VK_SHADER_STAGE_FRAGMENT_BIT, 0, {}> FragmentShader; +typedef VulkanShader<"MeshShaderXYZ.spirv", "main", VK_SHADER_STAGE_MESH_BIT_EXT, 3, {{{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2}}}> MeshVulkanShader; +typedef VulkanShader<"FragmentShaderSolidWhite.spirv", "main", VK_SHADER_STAGE_FRAGMENT_BIT, 0, {}> FragmentShader; typedef VulkanPipeline Pipeline; int main() { diff --git a/project.json b/project.json index 781cb20..15ea39f 100644 --- a/project.json +++ b/project.json @@ -7,19 +7,19 @@ "source_files": ["Crafter.Graphics-Window","Crafter.Graphics-WindowWayland","Crafter.Graphics-WindowWaylandWayland", "Crafter.Graphics-UiElement", "Crafter.Graphics-VulkanDevice", "Crafter.Graphics-WindowWaylandVulkan", "VulkanBuffer", "VulkanTools", "Crafter.Graphics-Camera"], "c_files": ["wayland-xdg-decoration-unstable-v1-client-protocol", "xdg-shell-protocol", "shm"], "module_files": ["Crafter.Graphics-Window","Crafter.Graphics-WindowWayland","Crafter.Graphics-WindowWaylandWayland", "Crafter.Graphics", "Crafter.Graphics-UiElement", "Crafter.Graphics-Types", "Crafter.Graphics-VulkanDevice", "Crafter.Graphics-VulkanPipeline", "Crafter.Graphics-VulkanShader", "Crafter.Graphics-WindowWaylandVulkan", "Crafter.Graphics-Camera", "Crafter.Graphics-VulkanBuffer", "Crafter.Graphics-Mesh", "Crafter.Graphics-MeshShader"], - "build_dir": "./build", - "output_dir": "./bin", + "build_dir": "build", + "output_dir": "bin", "type":"library", "libs": ["wayland-client", "vulkan"], "flags": ["-Wno-uninitialized"], "shaders": [ { - "path":"test.mesh", + "path":"MeshShaderXYZ.mesh", "type":13, "entrypoint":"main" }, { - "path":"test2.frag", + "path":"FragmentShaderSolidWhite.frag", "type":4, "entrypoint":"main" }