Catcrafts/Crafter.Graphics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crafter.asset rewrite

Browse source
This commit is contained in:
Jorijn van der Graaf 2025-05-24 00:52:06 +02:00
commit 43e1fda736
4 changed files with 58 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Crafter.Graphics-MeshShader.cppm
View file

@ -52,11 +52,11 @@ namespace Crafter {
) { ) {
transform = MatrixRowMajor<float, 4, 4, 1>::Identity(); transform = MatrixRowMajor<float, 4, 4, 1>::Identity();
} }
void WriteDescriptors(VkDescriptorSet* set) { void WriteDescriptors(VkDescriptorSet set) {
VkWriteDescriptorSet write[3] = { VkWriteDescriptorSet write[3] = {
vks::initializers::writeDescriptorSet(set[0], VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, &mvp.descriptor), vks::initializers::writeDescriptorSet(set, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, &mvp.descriptor),
vks::initializers::writeDescriptorSet(set[0], VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, &mesh->verticies.descriptor), vks::initializers::writeDescriptorSet(set, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, &mesh->verticies.descriptor),
vks::initializers::writeDescriptorSet(set[0], VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, &mesh->indicies.descriptor) vks::initializers::writeDescriptorSet(set, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, &mesh->indicies.descriptor)
}; };
vkUpdateDescriptorSets(VulkanDevice::device, 3, &write[0], 0, nullptr); vkUpdateDescriptorSets(VulkanDevice::device, 3, &write[0], 0, nullptr);
} }

4
Crafter.Graphics-TextureShader.cppm
View file

@ -63,8 +63,8 @@ namespace Crafter {
imageInfo.imageView = texture->imageView; imageInfo.imageView = texture->imageView;
imageInfo.sampler = textureSampler; imageInfo.sampler = textureSampler;
} }
void WriteDescriptors(VkDescriptorSet* set) { void WriteDescriptors(VkDescriptorSet set) {
VkWriteDescriptorSet write = vks::initializers::writeDescriptorSet(set[1], VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 0, &imageInfo); VkWriteDescriptorSet write = vks::initializers::writeDescriptorSet(set, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 0, &imageInfo);
vkUpdateDescriptorSets(VulkanDevice::device, 1, &write, 0, nullptr); vkUpdateDescriptorSets(VulkanDevice::device, 1, &write, 0, nullptr);
} }
}; };

59
Crafter.Graphics-VulkanTexture.cppm
View file

@ -35,13 +35,13 @@ namespace Crafter {
export template <typename PixelType> export template <typename PixelType>
class VulkanTexture { class VulkanTexture {
public: public:
uint32_t width;
uint32_t height;
VkImage image; VkImage image;
VkDeviceMemory imageMemory; VkDeviceMemory imageMemory;
Buffer<PixelType> buffer; Buffer<PixelType> buffer;
VkImageView imageView; VkImageView imageView;
VulkanTexture(std::uint32_t width, std::uint32_t height, const PixelType* pixels, VkCommandBuffer cmd) : buffer(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, width*height) { VulkanTexture(std::uint32_t width, std::uint32_t height, VkCommandBuffer cmd) : width(width), height(height), buffer(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, width*height) {
memcpy(buffer.value, pixels, width*height*sizeof(PixelType));
VkImageCreateInfo imageInfo{}; VkImageCreateInfo imageInfo{};
imageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; imageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
imageInfo.imageType = VK_IMAGE_TYPE_2D; imageInfo.imageType = VK_IMAGE_TYPE_2D;
@ -70,7 +70,29 @@ namespace Crafter {
vkBindImageMemory(VulkanDevice::device, image, imageMemory, 0); vkBindImageMemory(VulkanDevice::device, image, imageMemory, 0);
TransitionImageLayout(cmd, buffer, image, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); VkImageViewCreateInfo viewInfo{};
viewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
viewInfo.image = image;
viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
viewInfo.format = VK_FORMAT_R8G8B8A8_UNORM;
viewInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
viewInfo.subresourceRange.baseMipLevel = 0;
viewInfo.subresourceRange.levelCount = 1;
viewInfo.subresourceRange.baseArrayLayer = 0;
viewInfo.subresourceRange.layerCount = 1;
VulkanDevice::CHECK_VK_RESULT(vkCreateImageView(VulkanDevice::device, &viewInfo, nullptr, &imageView));
TransitionImageLayout(cmd, buffer, image, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
}
VulkanTexture(const char* asset, VkCommandBuffer cmd) : VulkanTexture(reinterpret_cast<const std::uint32_t*>(asset)[0], reinterpret_cast<const std::uint32_t*>(asset)[1], cmd) {
Update(reinterpret_cast<const PixelType*>(reinterpret_cast<const std::uint32_t*>(asset)+2), cmd);
}
void Update(const PixelType* bufferdata, VkCommandBuffer cmd) {
memcpy(buffer.value, bufferdata, height*width*sizeof(PixelType));
TransitionImageLayout(cmd, buffer, image, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
VkBufferImageCopy region{}; VkBufferImageCopy region{};
region.bufferOffset = 0; region.bufferOffset = 0;
@ -92,23 +114,6 @@ namespace Crafter {
); );
TransitionImageLayout(cmd, buffer, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); TransitionImageLayout(cmd, buffer, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
VkImageViewCreateInfo viewInfo{};
viewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
viewInfo.image = image;
viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
viewInfo.format = VK_FORMAT_R8G8B8A8_UNORM;
viewInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
viewInfo.subresourceRange.baseMipLevel = 0;
viewInfo.subresourceRange.levelCount = 1;
viewInfo.subresourceRange.baseArrayLayer = 0;
viewInfo.subresourceRange.layerCount = 1;
VulkanDevice::CHECK_VK_RESULT(vkCreateImageView(VulkanDevice::device, &viewInfo, nullptr, &imageView));
}
VulkanTexture(const char* asset, VkCommandBuffer cmd) : VulkanTexture(reinterpret_cast<const std::uint32_t*>(asset)[0], reinterpret_cast<const std::uint32_t*>(asset)[1], reinterpret_cast<const PixelType*>(reinterpret_cast<const std::uint32_t*>(asset)+2), cmd) {
} }
private: private:
@ -137,12 +142,24 @@ namespace Crafter {
sourceStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; sourceStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
destinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT; destinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
} else if (oldLayout == VK_IMAGE_LAYOUT_UNDEFINED && newLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) {
barrier.srcAccessMask = 0;
barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
sourceStage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
destinationStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
} else if (oldLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL && newLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) { } else if (oldLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL && newLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) {
barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT; barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
sourceStage = VK_PIPELINE_STAGE_TRANSFER_BIT; sourceStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
destinationStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; destinationStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
} else if (oldLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL && newLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) {
barrier.srcAccessMask = VK_ACCESS_SHADER_READ_BIT;
barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
sourceStage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
destinationStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
} else { } else {
throw std::invalid_argument("unsupported layout transition!"); throw std::invalid_argument("unsupported layout transition!");
} }

26
main.cpp
View file

@ -21,8 +21,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <iostream> #include <iostream>
#include <exception> #include <exception>
#include <thread> #include <thread>
#include <cstdlib>
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include "VulkanInitializers.hpp" #include "VulkanInitializers.hpp"
import Crafter.Graphics; import Crafter.Graphics;
import Crafter.Asset; import Crafter.Asset;
import Crafter.Event; import Crafter.Event;
@ -41,30 +43,30 @@ int main() {
WindowWaylandVulkan window("Crafter.Graphics", 1280, 720); WindowWaylandVulkan window("Crafter.Graphics", 1280, 720);
Asset asset; AssetLoad asset("cannon.cras");
asset.LoadFull("cannon.cras");
Camera camera(1.57079633, 16 / 9, 0.01, 512); Camera camera(1.57079633, 16 / 9, 0.01, 512);
camera.Update(); camera.Update();
VkCommandBuffer cmd = window.StartInit(); VkCommandBuffer cmd = window.StartInit();
Mesh<VertexUV> mesh = Mesh<VertexUV>(asset.entries[0].data.data()); std::vector<char> meshVector = asset.Load(0);
Mesh<VertexUV> mesh(meshVector.data());
MeshShader<VertexUV> meshShader(&mesh, &camera); MeshShader<VertexUV> meshShader(&mesh, &camera);
Asset asset2; AssetLoad asset2("texture.cras");
asset2.LoadFull("texture.cras"); std::vector<char> texvector = asset2.Load(0);
VulkanTexture<Pixel_RU8_GU8_BU8_AU8> txt = VulkanTexture<Pixel_RU8_GU8_BU8_AU8>(asset2.entries[0].data.data(), cmd); VulkanTexture<Pixel_RU8_GU8_BU8_AU8> txt = VulkanTexture<Pixel_RU8_GU8_BU8_AU8>(texvector.data(), cmd);
TextureShader texShader(&txt); TextureShader texShader(&txt);
DescriptorSet<MeshVulkanShader, FragmentShader> descriptors; DescriptorSet<MeshVulkanShader, FragmentShader> descriptors;
EventListener<void> bruhlistener(&descriptors.onDescriptorRefresh, [&meshShader, &texShader, &camera, &descriptors](){ EventListener<void> bruhlistener(&descriptors.onDescriptorRefresh, [&meshShader, &texShader, &camera, &descriptors](){
meshShader.WriteDescriptors(&descriptors.set[0]); meshShader.WriteDescriptors(descriptors.set[0]);
texShader.WriteDescriptors(&descriptors.set[0]); texShader.WriteDescriptors(descriptors.set[1]);
}); });
meshShader.WriteDescriptors(&descriptors.set[0]); meshShader.WriteDescriptors(descriptors.set[0]);
texShader.WriteDescriptors(&descriptors.set[0]); texShader.WriteDescriptors(descriptors.set[1]);
MeshShader<VertexUV> meshShader2(&mesh, &camera); MeshShader<VertexUV> meshShader2(&mesh, &camera);
TextureShader texShader2(&txt); TextureShader texShader2(&txt);
DescriptorSet<MeshVulkanShader, FragmentShader> descriptors2; DescriptorSet<MeshVulkanShader, FragmentShader> descriptors2;
meshShader2.WriteDescriptors(&descriptors2.set[0]); meshShader2.WriteDescriptors(descriptors2.set[0]);
texShader2.WriteDescriptors(&descriptors2.set[0]); texShader2.WriteDescriptors(descriptors2.set[1]);
meshShader.Update(); meshShader.Update();
meshShader2.Update(); meshShader2.Update();