Add some higher level classes

Author: dpjudas

CMakeLists.txt

@@ -2,6 +2,13 @@ cmake_minimum_required(VERSION 3.11)
 project(zvulkan)
 
 set(ZVULKAN_SOURCES
+	src/gpubindgroup.cpp
+	src/gpubuffer.cpp
+	src/gpucommands.cpp
+	src/gpudevice.cpp
+	src/gpupipeline.cpp
+	src/gputexture.cpp
+	src/gpuqueryset.cpp
 	src/vulkanbuilders.cpp
 	src/vulkandevice.cpp
 	src/vulkaninstance.cpp
@@ -116,6 +123,14 @@ set(ZVULKAN_SOURCES
 )
 
 set(ZVULKAN_INCLUDES
+	include/zvulkan/gpubindgroup.h
+	include/zvulkan/gpubuffer.h
+	include/zvulkan/gpucommands.h
+	include/zvulkan/gpudevice.h
+	include/zvulkan/gpupipeline.h
+	include/zvulkan/gputexture.h
+	include/zvulkan/gpuqueryset.h
+	include/zvulkan/gpuformat.h
 	include/zvulkan/vulkanbuilders.h
 	include/zvulkan/vulkancompatibledevice.h
 	include/zvulkan/vulkandevice.h

include/zvulkan/gpubindgroup.h

@@ -0,0 +1,164 @@
+#pragma once
+
+#include <cstdint>
+#include <memory>
+#include <vector>
+#include <string>
+#include "gpuformat.h"
+#include "vulkanobjects.h"
+
+class GPUDevice;
+class GPUBuffer;
+class GPUExternalTexture;
+class GPUSampler;
+class GPUTextureView;
+class GPUBindGroupLayout;
+
+struct GPUShaderStage
+{
+	enum
+	{
+		vertex = 0x1,
+		fragment = 0x2,
+		compute = 0x4
+	};
+};
+typedef uint32_t GPUShaderStageFlags;
+
+class GPUBufferBinding
+{
+public:
+	std::shared_ptr<GPUBuffer> buffer;
+	size_t offset = 0;
+	size_t size = 0;
+};
+
+class GPUBindGroupBinding
+{
+public:
+	int bindingIndex = 0;
+	struct
+	{
+		GPUBufferBinding buffer;
+		std::shared_ptr<GPUExternalTexture> externalTexture;
+		std::shared_ptr<GPUSampler> sampler;
+		std::shared_ptr<GPUTextureView> textureView;
+	} resource;
+};
+
+class GPUBindGroupDesc
+{
+public:
+	std::vector<GPUBindGroupBinding> bindings;
+	std::shared_ptr<GPUBindGroupLayout> layout;
+	std::string label;
+};
+
+class GPUBindGroup
+{
+public:
+	GPUBindGroup(GPUDevice* device, const GPUBindGroupDesc& desc);
+
+	GPUDevice* device = nullptr;
+	GPUBindGroupDesc desc;
+
+	std::unique_ptr<VulkanDescriptorSet> descriptorSet;
+};
+
+enum class GPUBindGroupLayoutBufferType
+{
+	uniform,
+	readOnlyStorage,
+	storage,
+};
+
+enum class GPUBindGroupLayoutBindingType
+{
+	buffer,
+	externalTexture,
+	sampler,
+	storageTexture,
+	texture
+};
+
+enum class GPUSamplerType
+{
+	filtering,
+	comparison,
+	nonFiltering
+};
+
+enum class GPUAccess
+{
+	readOnly,
+	readWrite,
+	writeOnly
+};
+
+enum class GPUViewDimension
+{
+	image1D,
+	image2D,
+	image2DArray,
+	imageCube,
+	imageCubeArray,
+	image3D
+};
+
+enum class GPUViewSampleType
+{
+	float32,
+	depth,
+	sint,
+	uint,
+	unfilteredFloat
+};
+
+class GPUBindGroupLayoutBinding
+{
+public:
+	int bindingIndex = 0;
+	GPUShaderStageFlags visibility = GPUShaderStage::fragment;
+	GPUBindGroupLayoutBindingType type = {};
+	struct
+	{
+		bool hasDynamicOffset = false;
+		int minBindingSize = 0;
+		GPUBindGroupLayoutBufferType type = GPUBindGroupLayoutBufferType::uniform;
+	} buffer;
+	struct
+	{
+		GPUSamplerType type = GPUSamplerType::filtering;
+	} sampler;
+	struct
+	{
+		GPUAccess access = GPUAccess::readOnly;
+		GPUFormat format = {};
+		GPUViewDimension viewDimension = GPUViewDimension::image2D;
+	} storageTexture;
+	struct
+	{
+		bool multisampled = false;
+		GPUViewSampleType sampleType = GPUViewSampleType::float32;
+		GPUViewDimension viewDimension = GPUViewDimension::image2D;
+	} texture;
+};
+
+class GPUBindGroupLayoutDesc
+{
+public:
+	std::vector<GPUBindGroupLayoutBinding> bindings;
+	std::string label;
+};
+
+class GPUBindGroupLayout
+{
+public:
+	GPUBindGroupLayout(GPUDevice* device, const GPUBindGroupLayoutDesc& desc);
+
+	GPUDevice* device = nullptr;
+	GPUBindGroupLayoutDesc desc;
+
+	std::unique_ptr<VulkanDescriptorSetLayout> layout;
+	std::unique_ptr<VulkanDescriptorPool> pool;
+};

include/zvulkan/gpubuffer.h

@@ -0,0 +1,64 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+#include "vulkanobjects.h"
+
+class GPUDevice;
+class GPUPromise;
+
+struct GPUUsage
+{
+	enum
+	{
+		mapRead = 0x1,
+		mapWrite = 0x2,
+		copySrc = 0x4,
+		copyDst = 0x8,
+		index = 0x10,
+		vertex = 0x20,
+		uniform = 0x40,
+		storage = 0x80,
+		indirect = 0x100,
+		queryResolve = 0x200,
+	};
+};
+typedef uint32_t GPUUsageFlags;
+
+class GPUBufferDesc
+{
+public:
+	std::string label;
+	bool mappedAtCreation = false;
+	size_t size = 0;
+	GPUUsageFlags usage = 0;
+};
+
+class GPUMappedRange
+{
+public:
+	void* data = nullptr;
+	size_t offset = 0;
+	size_t size = 0;
+};
+
+class GPUBuffer
+{
+public:
+	GPUBuffer(GPUDevice* device, const GPUBufferDesc& desc);
+
+	const GPUMappedRange& getMappedRange() const { return mappedRange; }
+
+	GPUPromise mapAsync();
+	void unmap();
+
+	void destroy();
+
+	GPUDevice* device = nullptr;
+	GPUBufferDesc desc;
+
+	std::unique_ptr<VulkanBuffer> buffer;
+
+private:
+	GPUMappedRange mappedRange;
+};