[gpu] Simplify GPU demo dep handling across CIs

Drop gpu_demo option. GLEW/GLFW use required:false — demo builds
when deps are found, skipped when not. Install GLEW/GLFW on all
CIs (Linux already had them, add to macOS and Rust). MinGW CI
uses wraps via --wrap-mode=default.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Behdad EsfahbodandClaude Opus 4.6 committed 2026-03-30 16:02:04 -06:00
1 parent d30dc93503
commit f138460772
5 files changed
+15 -18

No files matched your search

-1
View File
@@ -34,7 +34,6 @@ meson setup \
-Dgdi=enabled \
-Ddirectwrite=enabled \
-Dgpu=enabled \
-Dgpu_demo=enabled \
${BUILD} \
"$@"
+2
View File
@@ -31,6 +31,8 @@ jobs:
freetype \
glib \
gobject-introspection \
glew \
glfw \
graphite2 \
icu4c \
libpng \
+2
View File
@@ -43,6 +43,8 @@ jobs:
libpng-dev \
pkg-config \
zlib1g-dev \
libglew-dev \
libglfw3-dev \
bindgen
- name: Setup Python
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
-2
View File
@@ -39,8 +39,6 @@ option('vector', type: 'feature', value: 'enabled',
description: 'Enable HarfBuzz glyph vector drawing library')
option('gpu', type: 'feature', value: 'enabled',
description: 'Enable HarfBuzz GPU rasterization library')
option('gpu_demo', type: 'feature', value: 'auto',
description: 'Build hb-gpu demo (requires GLEW, GLFW, GL)')
option('subset', type: 'feature', value: 'enabled',
description: 'Enable HarfBuzz font subsetting and instancing library')
+11 -15
View File
@@ -33,19 +33,15 @@ if host_machine.system() == 'windows'
)
endif
gpu_demo_opt = get_option('gpu_demo')
have_gpu_demo_deps = false
if not gpu_demo_opt.disabled()
glew_dep = dependency('glew', required: gpu_demo_opt)
glfw_dep = dependency('glfw3', required: gpu_demo_opt)
if host_machine.system() == 'darwin'
gl_dep = dependency('appleframeworks', modules: ['OpenGL'], required: gpu_demo_opt)
metal_dep = dependency('appleframeworks', modules: ['Metal', 'QuartzCore', 'Foundation', 'AppKit'], required: false)
else
gl_dep = dependency('gl', required: gpu_demo_opt)
metal_dep = disabler()
endif
d3d11_dep = meson.get_compiler('cpp').find_library('d3d11', required: false)
d3dcompiler_dep = meson.get_compiler('cpp').find_library('d3dcompiler_47', required: false)
have_gpu_demo_deps = glew_dep.found() and glfw_dep.found() and gl_dep.found()
glew_dep = dependency('glew', required: false)
glfw_dep = dependency('glfw3', required: false)
if host_machine.system() == 'darwin'
gl_dep = dependency('appleframeworks', modules: ['OpenGL'], required: false)
metal_dep = dependency('appleframeworks', modules: ['Metal', 'QuartzCore', 'Foundation', 'AppKit'], required: false)
else
gl_dep = dependency('gl', required: false)
metal_dep = disabler()
endif
d3d11_dep = meson.get_compiler('cpp').find_library('d3d11', required: false)
d3dcompiler_dep = meson.get_compiler('cpp').find_library('d3dcompiler_47', required: false)
have_gpu_demo_deps = glew_dep.found() and glfw_dep.found() and gl_dep.found()