From 5e33097e4649f1c886275db18dc532930487457b Mon Sep 17 00:00:00 2001
From: skal <pascal.massimino@gmail.com>
Date: Sat, 14 Feb 2026 12:50:27 +0100
Subject: Refactor: factorize WGPU init code for 3D tests

Extracted duplicate WGPU initialization boilerplate from test_3d_physics,
test_3d_render, and test_mesh into shared helper (test_3d_helpers).

**Changes:**
- New: src/tests/common/test_3d_helpers.{h,cc} (~120 LOC)
- Removed ~280 LOC of duplicate init_wgpu() implementations
- Net savings: -141 LOC

**Benefits:**
- Single source of truth for surface+device initialization
- Eliminates cross-compile #ifdef duplication
- Easier maintenance for callback API changes

All 34 tests pass.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 src/tests/3d/test_mesh.cc | 95 +++--------------------------------------------
 1 file changed, 6 insertions(+), 89 deletions(-)

(limited to 'src/tests/3d/test_mesh.cc')

diff --git a/src/tests/3d/test_mesh.cc b/src/tests/3d/test_mesh.cc
index 2129bc8..0374ed8 100644
--- a/src/tests/3d/test_mesh.cc
+++ b/src/tests/3d/test_mesh.cc
@@ -10,6 +10,7 @@
 #include "platform/platform.h"
 #include "procedural/generator.h"
 #include "util/asset_manager_utils.h"
+#include "../common/test_3d_helpers.h"
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
@@ -27,98 +28,11 @@ static Camera g_camera;
 static WGPUDevice g_device = nullptr;
 static WGPUQueue g_queue = nullptr;
 static WGPUSurface g_surface = nullptr;
-static WGPUAdapter g_adapter = nullptr;
 static WGPUTextureFormat g_format = WGPUTextureFormat_Undefined;
 
 // Test-specific storage for mesh buffers
 static Renderer3D::MeshGpuData g_mesh_gpu_data;
 
-// Callbacks for asynchronous WGPU initialization (matches test_3d_render.cc)
-void on_adapter_request_ended(WGPURequestAdapterStatus status,
-                              WGPUAdapter adapter, WGPUStringView message,
-                              void* userdata, void* user2) {
-  (void)user2;
-  if (status == WGPURequestAdapterStatus_Success) {
-    *(WGPUAdapter*)userdata = adapter;
-  } else {
-    fprintf(stderr,
-            "Failed to request adapter.\n"); // Avoid WGPUStringView::s issues
-  }
-}
-
-void on_device_request_ended(WGPURequestDeviceStatus status, WGPUDevice device,
-                             WGPUStringView message, void* userdata,
-                             void* user2) {
-  (void)user2;
-  if (status == WGPURequestDeviceStatus_Success) {
-    *(WGPUDevice*)userdata = device;
-  } else {
-    fprintf(stderr,
-            "Failed to request device.\n"); // Avoid WGPUStringView::s issues
-  }
-}
-
-// --- WGPU Boilerplate ---
-void init_wgpu(WGPUInstance instance, PlatformState* platform_state) {
-  if (!instance) {
-    fprintf(stderr, "Failed to create WGPU instance.\n");
-    exit(1);
-  }
-
-  g_surface = platform_create_wgpu_surface(instance, platform_state);
-  if (!g_surface) {
-    fprintf(stderr, "Failed to create WGPU surface.\n");
-    exit(1);
-  }
-
-  // Request Adapter
-  WGPURequestAdapterOptions adapter_opts = {};
-  adapter_opts.compatibleSurface = g_surface;
-  adapter_opts.powerPreference = WGPUPowerPreference_HighPerformance;
-
-  WGPURequestAdapterCallbackInfo adapter_callback_info = {};
-  adapter_callback_info.mode = WGPUCallbackMode_WaitAnyOnly;
-  adapter_callback_info.callback = on_adapter_request_ended;
-  adapter_callback_info.userdata1 = &g_adapter; // Corrected to userdata1
-
-  wgpuInstanceRequestAdapter(instance, &adapter_opts, adapter_callback_info);
-
-  // Busy-wait for adapter
-  while (!g_adapter) {
-    platform_wgpu_wait_any(instance);
-  }
-
-  // Request Device
-  WGPUDeviceDescriptor device_desc = {};
-  WGPURequestDeviceCallbackInfo device_callback_info = {};
-  device_callback_info.mode = WGPUCallbackMode_WaitAnyOnly;
-  device_callback_info.callback = on_device_request_ended;
-  device_callback_info.userdata1 = &g_device; // Corrected to userdata1
-
-  wgpuAdapterRequestDevice(g_adapter, &device_desc, device_callback_info);
-
-  // Busy-wait for device
-  while (!g_device) {
-    platform_wgpu_wait_any(instance);
-  }
-
-  g_queue = wgpuDeviceGetQueue(g_device);
-
-  WGPUSurfaceCapabilities caps = {};
-  wgpuSurfaceGetCapabilities(g_surface, g_adapter, &caps);
-  g_format = caps.formats[0];
-
-  WGPUSurfaceConfiguration config = {};
-  config.device = g_device;
-  config.format = g_format;
-  config.usage = WGPUTextureUsage_RenderAttachment;
-  config.width = platform_state->width;
-  config.height = platform_state->height;
-  config.presentMode = WGPUPresentMode_Fifo;
-  config.alphaMode = WGPUCompositeAlphaMode_Opaque;
-  wgpuSurfaceConfigure(g_surface, &config);
-}
-
 // --- OBJ Loading Logic ---
 #include <cmath> // For std::sqrt
 
@@ -327,8 +241,11 @@ int main(int argc, char** argv) {
 
   PlatformState platform_state = platform_init(false, 1280, 720);
 
-  WGPUInstance instance = wgpuCreateInstance(nullptr);
-  init_wgpu(instance, &platform_state);
+  WgpuSurfaceContext wgpu_ctx = init_wgpu_with_surface(&platform_state);
+  g_device = wgpu_ctx.device;
+  g_queue = wgpu_ctx.queue;
+  g_surface = wgpu_ctx.surface;
+  g_format = wgpu_ctx.format;
   InitShaderComposer();
 
   g_renderer.init(g_device, g_queue, g_format);
-- 
cgit v1.2.3