commit 66fd2ebfe9b2cebddcd0dfa356084eac9556c866 Author: Warwick New Date: Thu May 14 14:32:37 2026 +0100 Moved initial code into window class diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..567609b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..74e07cd --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "extern/dawn"] + path = extern/dawn + url = https://github.com/google/dawn.git diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..be64417 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_minimum_required(VERSION 3.22) +project(webgpu) +set(CMAKE_CXX_STANDARD 20) + +# Compile commands for dev +set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "") +if(CMAKE_EXPORT_COMPILE_COMMANDS) + set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES + ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}) +endif() + +# Binaries +add_executable( ${PROJECT_NAME} ) +target_include_directories(${PROJECT_NAME} PUBLIC + $ + $ +) +file(GLOB_RECURSE SOURCE_FILES + ${CMAKE_SOURCE_DIR}/src/*.cpp) +target_sources(${PROJECT_NAME} PRIVATE ${SOURCE_FILES}) + +# Error on memory address issues in debug mode +if(CMAKE_BUILD_TYPE MATCHES "Debug") + set(CMAKE_C_FLAGS + "${CMAKE_C_FLAGS} -Werror -fsanitize=undefined -fsanitize=address" + ) + target_link_options(${PROJECT_NAME} + BEFORE PUBLIC -fsanitize=undefined PUBLIC -fsanitize=address + ) +endif() + +# Dawn library set up +# If we're in debug mode fast linking is the priority over easy distribution. +if(CMAKE_BUILD_TYPE MATCHES "Debug") + set(DAWN_BUILD_MONOLITHIC_LIBRARY "SHARED") +endif() +set(DAWN_FETCH_DEPENDENCIES ON) +add_subdirectory("extern/dawn" EXCLUDE_FROM_ALL) + + +# Linking +if(EMSCRIPTEN) + set_target_properties(app PROPERTIES SUFFIX ".html") + target_link_libraries(app PRIVATE emdawnwebgpu_cpp webgpu_glfw) + target_link_options(app PRIVATE "-sASYNCIFY=1" "-sUSE_GLFW=3") +else() + target_link_libraries(${PROJECT_NAME} PRIVATE webgpu_dawn webgpu_glfw glfw) +endif() diff --git a/LICENCE.md b/LICENCE.md new file mode 100644 index 0000000..6fb6a01 --- /dev/null +++ b/LICENCE.md @@ -0,0 +1,157 @@ +# GNU LESSER GENERAL PUBLIC LICENSE + +Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +This version of the GNU Lesser General Public License incorporates the +terms and conditions of version 3 of the GNU General Public License, +supplemented by the additional permissions listed below. + +## 0. Additional Definitions. + +As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the +GNU General Public License. + +"The Library" refers to a covered work governed by this License, other +than an Application or a Combined Work as defined below. + +An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + +A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + +The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + +The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + +## 1. Exception to Section 3 of the GNU GPL. + +You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + +## 2. Conveying Modified Versions. + +If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + +- a) under this License, provided that you make a good faith effort + to ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or +- b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + +## 3. Object Code Incorporating Material from Library Header Files. + +The object code form of an Application may incorporate material from a +header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + +- a) Give prominent notice with each copy of the object code that + the Library is used in it and that the Library and its use are + covered by this License. +- b) Accompany the object code with a copy of the GNU GPL and this + license document. + +## 4. Combined Works. + +You may convey a Combined Work under terms of your choice that, taken +together, effectively do not restrict modification of the portions of +the Library contained in the Combined Work and reverse engineering for +debugging such modifications, if you also do each of the following: + +- a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. +- b) Accompany the Combined Work with a copy of the GNU GPL and this + license document. +- c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. +- d) Do one of the following: + - 0) Convey the Minimal Corresponding Source under the terms of + this License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + - 1) Use a suitable shared library mechanism for linking with + the Library. A suitable mechanism is one that (a) uses at run + time a copy of the Library already present on the user's + computer system, and (b) will operate properly with a modified + version of the Library that is interface-compatible with the + Linked Version. +- e) Provide Installation Information, but only if you would + otherwise be required to provide such information under section 6 + of the GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the Application + with a modified version of the Linked Version. (If you use option + 4d0, the Installation Information must accompany the Minimal + Corresponding Source and Corresponding Application Code. If you + use option 4d1, you must provide the Installation Information in + the manner specified by section 6 of the GNU GPL for conveying + Corresponding Source.) + +## 5. Combined Libraries. + +You may place library facilities that are a work based on the Library +side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + +- a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities, conveyed under the terms of this License. +- b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + +## 6. Revised Versions of the GNU Lesser General Public License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +as you received it specifies that a certain numbered version of the +GNU Lesser General Public License "or any later version" applies to +it, you have the option of following the terms and conditions either +of that published version or of any later version published by the +Free Software Foundation. If the Library as you received it does not +specify a version number of the GNU Lesser General Public License, you +may choose any version of the GNU Lesser General Public License ever +published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/README.md b/README.md new file mode 100644 index 0000000..2747f65 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +My build command +```bash +CXX=clang++ CC=clang cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -GNinja -B build . && cmake --build build -j16 +``` diff --git a/extern/dawn b/extern/dawn new file mode 160000 index 0000000..98747c7 --- /dev/null +++ b/extern/dawn @@ -0,0 +1 @@ +Subproject commit 98747c789b4be3793d8676413bb1ab163b8e08a9 diff --git a/include/wne/window.hpp b/include/wne/window.hpp new file mode 100644 index 0000000..50bc16d --- /dev/null +++ b/include/wne/window.hpp @@ -0,0 +1,47 @@ +#pragma once + +#include + +#include +#if defined(__EMSCRIPTEN__) +#include +#endif +#include +#include +#include + +namespace wne { +// TODO: load me in a better way +const char shaderCode[] = R"( + @vertex fn vertexMain(@builtin(vertex_index) i : u32) -> + @builtin(position) vec4f { + const pos = array(vec2f(0, 1), vec2f(-1, -1), vec2f(1, -1)); + return vec4f(pos[i], 0, 1); + } + @fragment fn fragmentMain() -> @location(0) vec4f { + return vec4f(1, 0, 0, 1); + } +)"; + +class window { + wgpu::Instance instance; + wgpu::Adapter adapter; + wgpu::Device device; + wgpu::RenderPipeline pipeline; + + wgpu::Surface surface; + wgpu::TextureFormat format; + const uint32_t kWidth = 512; + const uint32_t kHeight = 512; + + void ConfigureSurface(); + void CreateRenderPipeline(); + void Render(); + void InitGraphics(); + +public: + //TODO: make init the constructor + window(); + void Start(); +}; +} // namespace wne diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..2cf9239 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,6 @@ +#include "wne/window.hpp" + +int main() { + wne::window window = wne::window{}; + window.Start(); +} diff --git a/src/window.cpp b/src/window.cpp new file mode 100644 index 0000000..686fb76 --- /dev/null +++ b/src/window.cpp @@ -0,0 +1,116 @@ +#include "wne/window.hpp" + +namespace wne { + +void window::ConfigureSurface() { + wgpu::SurfaceCapabilities capabilities; + surface.GetCapabilities(adapter, &capabilities); + format = capabilities.formats[0]; + + wgpu::SurfaceConfiguration config{ + .device = device, .format = format, .width = kWidth, .height = kHeight}; + surface.Configure(&config); +} + +void window::CreateRenderPipeline() { + wgpu::ShaderSourceWGSL wgsl{{.code = shaderCode}}; + + wgpu::ShaderModuleDescriptor shaderModuleDescriptor{.nextInChain = &wgsl}; + wgpu::ShaderModule shaderModule = + device.CreateShaderModule(&shaderModuleDescriptor); + + wgpu::ColorTargetState colorTargetState{.format = format}; + + wgpu::FragmentState fragmentState{ + .module = shaderModule, .targetCount = 1, .targets = &colorTargetState}; + + wgpu::RenderPipelineDescriptor descriptor{.vertex = {.module = shaderModule}, + .fragment = &fragmentState}; + pipeline = device.CreateRenderPipeline(&descriptor); +} +void window::Render() { + wgpu::SurfaceTexture surfaceTexture; + surface.GetCurrentTexture(&surfaceTexture); + + wgpu::RenderPassColorAttachment attachment{ + .view = surfaceTexture.texture.CreateView(), + .loadOp = wgpu::LoadOp::Clear, + .storeOp = wgpu::StoreOp::Store}; + + wgpu::RenderPassDescriptor renderpass{.colorAttachmentCount = 1, + .colorAttachments = &attachment}; + + wgpu::CommandEncoder encoder = device.CreateCommandEncoder(); + wgpu::RenderPassEncoder pass = encoder.BeginRenderPass(&renderpass); + pass.SetPipeline(pipeline); + pass.Draw(3); + pass.End(); + wgpu::CommandBuffer commands = encoder.Finish(); + device.GetQueue().Submit(1, &commands); +} +void window::InitGraphics() { + ConfigureSurface(); + CreateRenderPipeline(); +} + +window::window() { + static const auto kTimedWaitAny = wgpu::InstanceFeatureName::TimedWaitAny; + wgpu::InstanceDescriptor instanceDesc{.requiredFeatureCount = 1, + .requiredFeatures = &kTimedWaitAny}; + instance = wgpu::CreateInstance(&instanceDesc); + + wgpu::Future f1 = instance.RequestAdapter( + nullptr, wgpu::CallbackMode::WaitAnyOnly, + [this](wgpu::RequestAdapterStatus status, wgpu::Adapter a, + wgpu::StringView message) { + if (status != wgpu::RequestAdapterStatus::Success) { + std::cout << "RequestAdapter: " << message << "\n"; + exit(0); + } + adapter = std::move(a); + }); + instance.WaitAny(f1, UINT64_MAX); + + wgpu::DeviceDescriptor desc{}; + desc.SetUncapturedErrorCallback([](const wgpu::Device &, + wgpu::ErrorType errorType, + wgpu::StringView message) { + std::cout << "Error: " << errorType << " - message: " << message << "\n"; + }); + + wgpu::Future f2 = adapter.RequestDevice( + &desc, wgpu::CallbackMode::WaitAnyOnly, + [this](wgpu::RequestDeviceStatus status, wgpu::Device d, + wgpu::StringView message) { + if (status != wgpu::RequestDeviceStatus::Success) { + std::cout << "RequestDevice: " << message << "\n"; + exit(0); + } + device = std::move(d); + }); + instance.WaitAny(f2, UINT64_MAX); +} +void window::Start() { + if (!glfwInit()) { + return; + } + + glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); + GLFWwindow *window = + glfwCreateWindow(kWidth, kHeight, "WebGPU window", nullptr, nullptr); + surface = wgpu::glfw::CreateSurfaceForWindow(instance, window); + + InitGraphics(); + +#if defined(__EMSCRIPTEN__) + emscripten_set_main_loop(Render, 0, false); +#else + while (!glfwWindowShouldClose(window)) { + glfwPollEvents(); + Render(); + surface.Present(); + instance.ProcessEvents(); + } +#endif +} +} // namespace wne