added basic shader, spirv, and texture

Author: malytomas

.gitmodules

@@ -118,3 +118,6 @@
 [submodule "externals/dawn/dawn"]
 	path = externals/dawn/dawn
 	url = https://dawn.googlesource.com/dawn
+[submodule "externals/glslang/glslang"]
+	path = externals/glslang/glslang
+	url = https://github.com/KhronosGroup/glslang.git

externals/CMakeLists.txt

@@ -98,15 +98,16 @@ add_subdirectory(curl)
 add_subdirectory(cpr)
 
 add_subdirectory(fastnoise)
+add_subdirectory(glfw)
+add_subdirectory(glm)
 add_subdirectory(plf)
 add_subdirectory(simplefilewatcher)
 add_subdirectory(stb)
 add_subdirectory(unordered_dense)
 add_subdirectory(wamr)
 
 add_subdirectory(dawn)
-add_subdirectory(glfw)
-add_subdirectory(glm)
+add_subdirectory(glslang)
 add_subdirectory(openxr-sdk)
 
 if(cage_use_steam_sockets)

externals/dawn/CMakeLists.txt

@@ -4,6 +4,7 @@ message(STATUS "----------------------------------------------------------------
 
 set(CMAKE_DISABLE_FIND_PACKAGE_Python3 OFF)
 
+# dawn
 set(DAWN_ENABLE_INSTALL ON CACHE INTERNAL "Enable install step for Dawn libraries" FORCE)
 set(DAWN_ENABLE_D3D11 OFF CACHE INTERNAL "Enable compilation of the D3D11 backend" FORCE)
 set(DAWN_ENABLE_D3D12 OFF CACHE INTERNAL "Enable compilation of the D3D12 backend" FORCE)
@@ -16,14 +17,15 @@ set(DAWN_ENABLE_VULKAN ON CACHE INTERNAL "Enable compilation of the Vulkan backe
 set(DAWN_FORCE_SYSTEM_COMPONENT_LOAD ON CACHE INTERNAL "Allow system component fallback" FORCE)
 set(DAWN_USE_WAYLAND OFF CACHE INTERNAL "Enable support for Wayland surface" FORCE)
 set(DAWN_USE_X11 OFF CACHE INTERNAL "Enable support for X11 surface" FORCE)
-set(DAWN_USE_GLFW OFF CACHE INTERNAL "Enable compilation of the GLFW windowing utils" FORCE)
+set(DAWN_USE_GLFW ON CACHE INTERNAL "Enable compilation of the GLFW windowing utils" FORCE)
 set(DAWN_USE_WINDOWS_UI OFF CACHE INTERNAL "Enable support for Windows UI surface" FORCE)
 set(DAWN_BUILD_SAMPLES OFF CACHE INTERNAL "Enables building Dawn's samples" FORCE)
 set(DAWN_BUILD_TESTS OFF CACHE INTERNAL "Enables building Dawn's tests" FORCE)
 set(DAWN_BUILD_PROTOBUF ${cage_use_steam_sockets} CACHE INTERNAL "Build the protobuf dependencies" FORCE)
 set(DAWN_ENABLE_PIC ON CACHE INTERNAL "Build with Position-Independent-Code enabled" FORCE)
 set(DAWN_BUILD_MONOLITHIC_LIBRARY "STATIC" CACHE INTERNAL "Build monolithic library: SHARED, STATIC, or OFF." FORCE)
 
+# tint
 set(TINT_BUILD_SPV_READER ON CACHE INTERNAL "Build the SPIR-V input reader" FORCE)
 set(TINT_BUILD_WGSL_READER ON CACHE INTERNAL "Build the WGSL input reader" FORCE)
 set(TINT_BUILD_GLSL_WRITER OFF CACHE INTERNAL "Build the GLSL output writer" FORCE)
@@ -32,22 +34,26 @@ set(TINT_BUILD_HLSL_WRITER OFF CACHE INTERNAL "Build the HLSL output writer" FOR
 set(TINT_BUILD_MSL_WRITER OFF CACHE INTERNAL "Build the MSL output writer" FORCE)
 set(TINT_BUILD_SPV_WRITER ON CACHE INTERNAL "Build the SPIR-V output writer" FORCE)
 set(TINT_BUILD_WGSL_WRITER ON CACHE INTERNAL "Build the WGSL output writer" FORCE)
-
 set(TINT_ENABLE_INSTALL OFF CACHE INTERNAL "Enable install step for Tint libraries" FORCE)
 set(TINT_BUILD_CMD_TOOLS OFF CACHE INTERNAL "Build the Tint command line tools" FORCE)
 set(TINT_BUILD_IR_BINARY OFF CACHE INTERNAL "Build IR binary format support" FORCE)
 set(TINT_BUILD_TESTS OFF CACHE INTERNAL "Build tests" FORCE)
 set(TINT_ENABLE_IR_VALIDATION ON CACHE INTERNAL "Enable IR validation for backend codegen" FORCE)
 
+# protobuf
 add_library(libprotobuf-mutator INTERFACE) # subvert unnecessary dependencies
 
+# add the externals
 add_subdirectory(dawn)
 
-add_library(webgpu::dawn ALIAS webgpu_dawn)
-
-
+# dawn
+add_library(cage_dawn INTERFACE)
+target_link_libraries(cage_dawn INTERFACE $<TARGET_LINKER_FILE:webgpu_dawn> $<TARGET_LINKER_FILE:webgpu_glfw>)
+target_include_directories(cage_dawn INTERFACE $<TARGET_PROPERTY:webgpu_dawn,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:webgpu_glfw,INTERFACE_INCLUDE_DIRECTORIES>)
+add_dependencies(cage_dawn webgpu_dawn webgpu_glfw)
+add_library(cage::dawn ALIAS cage_dawn)
 
-# make protobuf available to steam sockets
+# protobuf
 if(cage_use_steam_sockets)
 	set(filename "${CAGE_EXTERNALS_MODULE_PATH}/FindProtobuf.cmake")
 	file(WRITE ${filename} "\n")

externals/glslang/CMakeLists.txt

@@ -0,0 +1,17 @@
+message(STATUS "----------------------------------------------------------------")
+message(STATUS "glslang")
+message(STATUS "----------------------------------------------------------------")
+
+set(BUILD_EXTERNAL OFF CACHE INTERNAL "Build external dependencies in /External" FORCE)
+set(GLSLANG_TESTS OFF CACHE INTERNAL  "Enable glslang testing" FORCE)
+set(ENABLE_GLSLANG_BINARIES OFF CACHE INTERNAL "Builds glslang" FORCE)
+set(ENABLE_HLSL OFF CACHE INTERNAL "Enables HLSL input support" FORCE)
+
+add_subdirectory(glslang)
+
+add_library(cage_glslang INTERFACE)
+target_link_libraries(cage_glslang INTERFACE $<TARGET_LINKER_FILE:glslang>)
+target_link_libraries(cage_glslang INTERFACE $<TARGET_LINKER_FILE:glslang-default-resource-limits>)
+target_include_directories(cage_glslang INTERFACE $<TARGET_PROPERTY:glslang,INTERFACE_INCLUDE_DIRECTORIES>)
+add_dependencies(cage_glslang glslang glslang-default-resource-limits)
+add_library(cage::glslang ALIAS cage_glslang)

externals/glslang/glslang

@@ -73,8 +73,8 @@ cage_ide_sort_files(cage-core)
 
 file(GLOB_RECURSE cage-engine-sources "libengine/*" "include/cage-engine/*")
 add_library(cage-engine SHARED ${cage-engine-sources})
-target_link_libraries(cage-engine PRIVATE cubeb glfw webgpu::dawn openxr_loader freetype harfbuzz SheenBidi)
-target_link_libraries(cage-engine PUBLIC cage-core)
+target_link_libraries(cage-engine PRIVATE cubeb glfw openxr_loader freetype harfbuzz SheenBidi cage::glslang)
+target_link_libraries(cage-engine PUBLIC cage-core cage::dawn)
 file(GLOB_RECURSE controller-bindings RELATIVE "${CMAKE_CURRENT_LIST_DIR}" "controller-bindings/*")
 set(index 0)
 foreach(cb IN ITEMS ${controller-bindings})

sources/CMakeLists.txt

@@ -3,14 +3,34 @@
 
 #include <cage-engine/core.h>
 
+namespace wgpu
+{
+	class Device;
+	class Queue;
+}
+
 namespace cage
 {
+	class Window;
+	class Texture;
+
 	class CAGE_ENGINE_API GraphicsDevice : private Immovable
 	{
 	public:
+		void processEvents();
+
+		Holder<Texture> nextFrame(Window *window);
+
+		wgpu::Device nativeDevice();
+		wgpu::Queue nativeQueue();
+	};
+
+	struct CAGE_CORE_API GraphicsDeviceCreateConfig
+	{
+		Window *compatibility = nullptr;
 	};
 
-	CAGE_ENGINE_API Holder<GraphicsDevice> newGraphicsDevice();
+	CAGE_ENGINE_API Holder<GraphicsDevice> newGraphicsDevice(const GraphicsDeviceCreateConfig &config);
 }
 
 #endif

sources/include/cage-engine/graphicsDevice.h

@@ -0,0 +1,26 @@
+#ifndef guard_shader_cxvbjhgr85
+#define guard_shader_cxvbjhgr85
+
+#include <cage-engine/core.h>
+
+namespace wgpu
+{
+	class ShaderModule;
+}
+
+namespace cage
+{
+	class GraphicsDevice;
+	class Spirv;
+
+	class CAGE_ENGINE_API Shader : private Immovable
+	{
+	public:
+		wgpu::ShaderModule nativeVertex();
+		wgpu::ShaderModule nativeFragment();
+	};
+
+	CAGE_ENGINE_API Holder<Shader> newShader(GraphicsDevice *device, const Spirv *spirv);
+}
+
+#endif

sources/include/cage-engine/shader.h

@@ -0,0 +1,30 @@
+#ifndef guard_spirv_erst54fij
+#define guard_spirv_erst54fij
+
+#include <string>
+
+#include <cage-engine/core.h>
+
+namespace cage
+{
+	struct GlslConfig
+	{
+		std::string vertex;
+		std::string fragment;
+	};
+
+	class CAGE_ENGINE_API Spirv : private Immovable
+	{
+	public:
+		void importGlsl(const GlslConfig &glsl);
+		void importBuffer(PointerRange<const char> buffer);
+
+		PointerRange<const uint32> exportSpirvVertex() const;
+		PointerRange<const uint32> exportSpirvFragment() const;
+		Holder<PointerRange<char>> exportBuffer() const;
+	};
+
+	CAGE_ENGINE_API Holder<Spirv> newSpirv();
+}
+
+#endif

sources/include/cage-engine/spirv.h

@@ -0,0 +1,44 @@
+#ifndef guard_graphicsTexture_sdrfgh4d5g
+#define guard_graphicsTexture_sdrfgh4d5g
+
+#include <cage-engine/core.h>
+
+namespace wgpu
+{
+	class Texture;
+	class TextureView;
+}
+
+namespace cage
+{
+	class GraphicsDevice;
+
+	class CAGE_ENGINE_API Texture : private Immovable
+	{
+	protected:
+		detail::StringBase<128> label;
+
+	public:
+		void setLabel(const String &name);
+
+		Vec2i resolution() const;
+		Vec3i resolution3() const;
+		uint32 mipLevels() const; // 1 is just base level
+		Vec2i mipResolution(uint32 mipmapLevel) const;
+		Vec3i mipResolution3(uint32 mipmapLevel) const;
+
+		wgpu::Texture nativeTexture();
+		wgpu::TextureView nativeView();
+	};
+
+	struct CAGE_ENGINE_API TextureCreateConfig
+	{
+		Vec3i resolution = Vec3i(0, 0, 1);
+		uint32 mipLevels = 1;
+		bool volume3D = false; // true = 3D texture; false = layers, cube
+	};
+
+	CAGE_ENGINE_API Holder<Texture> newGraphicsTexture(GraphicsDevice *device, const TextureCreateConfig &config);
+}
+
+#endif