Merge branch 'main' into rebased

klukaszek · Sep 28, 2024 · 7c5d624 · 7c5d624
2 parents 0de0ac2 + 9b0fcfd
commit 7c5d624
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/gpu/SDL_gpu.c b/src/gpu/SDL_gpu.c
@@ -570,6 +570,13 @@ static void SDL_GPU_FillProperties(
     bool debug_mode,
     const char *name)
 {
+
+    SDL_GPUDevice *result;
+#ifdef __EMSCRIPTEN__
+    SDL_SetHint(SDL_HINT_GPU_DRIVER, "webgpu");
+#endif
+    SDL_PropertiesID props = SDL_CreateProperties();
+
     if (formatFlags & SDL_GPU_SHADERFORMAT_PRIVATE) {
         SDL_SetBooleanProperty(props, SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL, true);
     }
@@ -603,6 +610,7 @@ bool SDL_GPUSupportsShaderFormats(
     SDL_GPU_FillProperties(props, formatFlags, false, name);
     result = SDL_GPUSupportsProperties(props);
     SDL_DestroyProperties(props);
+    SDL_Log("SDL_CreateGPUDevice: %s", result ? "success" : "failure");
     return result;
 #else
     SDL_SetError("SDL not built with GPU support");

diff --git a/src/gpu/webgpu/SDL_gpu_webgpu.c b/src/gpu/webgpu/SDL_gpu_webgpu.c
@@ -1871,7 +1871,6 @@ static SDL_GPUGraphicsPipeline *WebGPU_CreateGraphicsPipeline(
     wgpuDevicePopErrorScope(renderer->device, WebGPU_ErrorCallback, renderer);
 
     SDL_Log("Graphics Pipeline Created Successfully");
-
     return (SDL_GPUGraphicsPipeline *)pipeline;
 }
 
@@ -2122,7 +2121,7 @@ static SDL_GPUDevice *WebGPU_CreateDevice(bool debug, bool preferLowPower, SDL_P
     result->AcquireCommandBuffer = WebGPU_AcquireCommandBuffer;
     result->AcquireSwapchainTexture = WebGPU_AcquireSwapchainTexture;
     result->GetSwapchainTextureFormat = WebGPU_GetSwapchainTextureFormat;
-
+  
     result->CreateShader = WebGPU_CreateShader;
     result->ReleaseShader = WebGPU_ReleaseShader;