Merge pull request #7504 from penpot/azazeln28-feat-webgl-error

🎉 Add debug and alert when WebGL is unsupported
This commit is contained in:
Alejandro Alonso
2025-10-15 12:51:45 +02:00
committed by GitHub
3 changed files with 27 additions and 16 deletions

View File

@@ -296,8 +296,9 @@
(->> wasm.api/module
(p/fmap (fn [ready?]
(when ready?
(reset! canvas-init? true)
(wasm.api/assign-canvas canvas)))))
(let [init? (wasm.api/init-canvas-context canvas)]
(reset! canvas-init? init?)
(when-not init? (js/alert "WebGL not supported")))))))
(fn []
(wasm.api/clear-canvas))))

View File

@@ -954,7 +954,7 @@
(h/call wasm/internal-module "_init_shapes_pool" total-shapes)
(set-objects base-objects)))
(def ^:private canvas-options
(def ^:private context-options
#js {:antialias false
:depth true
:stencil true
@@ -971,13 +971,20 @@
(dbg/enabled? :wasm-viewbox)
(bit-or 2r00000000000000000000000000000001)))
(defn assign-canvas
(defn set-canvas-size
[canvas]
(set! (.-width canvas) (* dpr (.-clientWidth ^js canvas)))
(set! (.-height canvas) (* dpr (.-clientHeight ^js canvas))))
(defn init-canvas-context
[canvas]
(let [gl (unchecked-get wasm/internal-module "GL")
flags (debug-flags)
context (.getContext ^js canvas "webgl2" canvas-options)
;; Register the context with emscripten
handle (.registerContext ^js gl context #js {"majorVersion" 2})]
context-id (if (dbg/enabled? :wasm-gl-context-init-error) "fail" "webgl2")
context (.getContext ^js canvas context-id context-options)
context-init? (not (nil? context))]
(when-not (nil? context)
(let [handle (.registerContext ^js gl context #js {"majorVersion" 2})]
(.makeContextCurrent ^js gl handle)
;; Force the WEBGL_debug_renderer_info extension as emscripten does not enable it
@@ -985,9 +992,9 @@
;; Initialize Wasm Render Engine
(h/call wasm/internal-module "_init" (/ (.-width ^js canvas) dpr) (/ (.-height ^js canvas) dpr))
(h/call wasm/internal-module "_set_render_options" flags dpr))
(set! (.-width canvas) (* dpr (.-clientWidth ^js canvas)))
(set! (.-height canvas) (* dpr (.-clientHeight ^js canvas))))
(h/call wasm/internal-module "_set_render_options" flags dpr)))
(set-canvas-size canvas)
context-init?))
(defn clear-canvas
[]

View File

@@ -96,9 +96,12 @@
;; Show some information about the WebGL context.
:gl-context
;; Show viewbox
;; Show viewbox.
:wasm-viewbox
;; Makes the GL context to fail on initialization.
:wasm-gl-context-init-error
;; Event times
:events-times})