Merge pull request #11 from ancientjpeg/globals-refactor

Refactor app/globals into context

.github/workflows/unit_tests.yml

@@ -11,6 +11,8 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    env: 
+      ACTIONS_UNIT_TESTS: "1"
     steps:
 
       - name: Apt Install Dependencies

example/example0.cpp

@@ -1,4 +1,4 @@
-#include "rndr/application.h"
+#include "rndr/context.h"
 #include "rndr/math/ops.h"
 #include "rndr/utils/helpers.h"
 #include <cassert>
@@ -8,7 +8,7 @@
 constexpr int w = 640;
 constexpr int h = 480;
 
-ustd::result  performBufferCopies(rndr::Application &program_gpu)
+ustd::result  performBufferCopies(rndr::Context &program_gpu)
 {
   const wgpu::Device &device = program_gpu.getDevice();
 
@@ -68,7 +68,7 @@ ustd::result  performBufferCopies(rndr::Application &program_gpu)
   return {};
 }
 
-ustd::result renderFrame(rndr::Application &program_gpu)
+ustd::result renderFrame(rndr::Context &program_gpu)
 {
 
   const wgpu::Device  &device   = program_gpu.getDevice();
@@ -79,8 +79,15 @@ ustd::result renderFrame(rndr::Application &program_gpu)
   program_gpu.processEvents();
 
   /* get current texture to write to */
+  auto surface_optional = program_gpu.getSurface();
+  if (!surface_optional) {
+    return ustd::unexpected(surface_optional.message());
+  }
+
+  const wgpu::Surface &surface = *surface_optional;
+
   wgpu::SurfaceTexture surface_tex;
-  program_gpu.getSurface().GetCurrentTexture(&surface_tex);
+  surface.GetCurrentTexture(&surface_tex);
 
   if (surface_tex.status != wgpu::SurfaceGetCurrentTextureStatus::Success) {
     std::ostringstream oss;
@@ -148,15 +155,15 @@ ustd::result renderFrame(rndr::Application &program_gpu)
   /* program_gpu.blockOnFuture(work_future); */
 
   /* finally, present the next texture */
-  program_gpu.getSurface().Present();
+  surface.Present();
 
   return {};
 }
 
 int main()
 {
-  rndr::Application program_gpu;
-  ustd::result      init_result = program_gpu.initialize();
+  rndr::Context program_gpu;
+  ustd::result  init_result = program_gpu.initialize();
 
   if (!init_result.ok()) {
     std::cerr << "Initialization failed for reason: " << init_result;

src/rndr/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_library(rndr STATIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/application.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/application.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/context.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/context.cpp
 )
 
 Include(FetchContent)