From eeec9bd9fa7b2de392c5bf28c7a9ea9a53edf591 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 13 Apr 2026 02:26:21 -0600 Subject: [PATCH] [gpu] Unify shader source getters; rename for draw/paint split MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace the two separate getters hb_gpu_shader_fragment_source (lang) hb_gpu_shader_vertex_source (lang) with a single hb_gpu_draw_shader_source (stage, lang) where stage is the new hb_gpu_shader_stage_t enum (VERTEX or FRAGMENT). Parameter order is stage-first because "the vertex shader in GLSL" reads more naturally than the reverse, and stage is the primary axis (it determines which shader object the source is compiled into). The `_draw_` in the new name makes room for the incoming hb_gpu_paint_shader_source() once the COLRv1 encoder lands — that family will have its own (likely different) shader sources per stage and language. Updated the four in-tree callers: test/api/test-gpu.cc, and the GPU demos under util/gpu/. ABI break on a 14.0-only API; the gpu library is still young enough that this is acceptable. Marked new API with XSince: REPLACEME. Assisted-by: Claude Opus 4.6 (1M context) --- docs/harfbuzz-sections.txt | 4 +- src/hb-gpu-shaders.cc | 75 ++++++++++++------------------- src/hb-gpu.cc | 9 +--- src/hb-gpu.h | 18 ++++++-- test/api/test-gpu.cc | 4 +- util/gpu/demo-metal.mm | 4 +- util/gpu/demo-renderer-d3d11.cc | 4 +- util/gpu/demo-shader.cc | 4 +- util/gpu/web/hb-gpu-web-webgpu.cc | 4 +- 9 files changed, 58 insertions(+), 68 deletions(-) diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt index e46cfa5bc..3d48b621e 100644 --- a/docs/harfbuzz-sections.txt +++ b/docs/harfbuzz-sections.txt @@ -1119,8 +1119,8 @@ hb_vector_paint_recycle_blob
hb-gpu hb_gpu_shader_lang_t -hb_gpu_shader_fragment_source -hb_gpu_shader_vertex_source +hb_gpu_shader_stage_t +hb_gpu_draw_shader_source hb_gpu_draw_t hb_gpu_draw_create_or_fail hb_gpu_draw_reference diff --git a/src/hb-gpu-shaders.cc b/src/hb-gpu-shaders.cc index b1b64e09a..05fa470db 100644 --- a/src/hb-gpu-shaders.cc +++ b/src/hb-gpu-shaders.cc @@ -39,62 +39,45 @@ /** - * hb_gpu_shader_fragment_source: + * hb_gpu_draw_shader_source: + * @stage: pipeline stage (vertex or fragment) * @lang: shader language variant * - * Returns the fragment shader source for the specified shader - * language. The returned string is static and must not be freed. + * Returns the shader source for the hb_gpu_draw_t renderer for the + * specified stage and language. The returned string is static and + * must not be freed. * - * The caller should prepend a `#version` directive and append - * their own `main()` function, then pass the combined sources + * For GLSL, the caller should prepend a `#version` directive and + * append their own `main()` function, then pass the combined sources * to `glShaderSource()`. * * Return value: (transfer none): - * A shader source string, or `NULL` if @lang is unsupported. + * A shader source string, or `NULL` if @stage or @lang is + * unsupported. * - * Since: 14.0.0 + * XSince: REPLACEME **/ const char * -hb_gpu_shader_fragment_source (hb_gpu_shader_lang_t lang) +hb_gpu_draw_shader_source (hb_gpu_shader_stage_t stage, + hb_gpu_shader_lang_t lang) { - switch (lang) { - case HB_GPU_SHADER_LANG_GLSL: - return hb_gpu_fragment_glsl; - case HB_GPU_SHADER_LANG_MSL: - return hb_gpu_fragment_msl; - case HB_GPU_SHADER_LANG_WGSL: - return hb_gpu_fragment_wgsl; - case HB_GPU_SHADER_LANG_HLSL: - return hb_gpu_fragment_hlsl; - default: - return nullptr; - } -} - -/** - * hb_gpu_shader_vertex_source: - * @lang: shader language variant - * - * Returns the vertex shader source for the specified shader - * language. The returned string is static and must not be freed. - * - * Return value: (transfer none): - * A shader source string, or `NULL` if @lang is unsupported. - * - * Since: 14.0.0 - **/ -const char * -hb_gpu_shader_vertex_source (hb_gpu_shader_lang_t lang) -{ - switch (lang) { - case HB_GPU_SHADER_LANG_GLSL: - return hb_gpu_vertex_glsl; - case HB_GPU_SHADER_LANG_MSL: - return hb_gpu_vertex_msl; - case HB_GPU_SHADER_LANG_WGSL: - return hb_gpu_vertex_wgsl; - case HB_GPU_SHADER_LANG_HLSL: - return hb_gpu_vertex_hlsl; + switch (stage) { + case HB_GPU_SHADER_STAGE_FRAGMENT: + switch (lang) { + case HB_GPU_SHADER_LANG_GLSL: return hb_gpu_fragment_glsl; + case HB_GPU_SHADER_LANG_MSL: return hb_gpu_fragment_msl; + case HB_GPU_SHADER_LANG_WGSL: return hb_gpu_fragment_wgsl; + case HB_GPU_SHADER_LANG_HLSL: return hb_gpu_fragment_hlsl; + default: return nullptr; + } + case HB_GPU_SHADER_STAGE_VERTEX: + switch (lang) { + case HB_GPU_SHADER_LANG_GLSL: return hb_gpu_vertex_glsl; + case HB_GPU_SHADER_LANG_MSL: return hb_gpu_vertex_msl; + case HB_GPU_SHADER_LANG_WGSL: return hb_gpu_vertex_wgsl; + case HB_GPU_SHADER_LANG_HLSL: return hb_gpu_vertex_hlsl; + default: return nullptr; + } default: return nullptr; } diff --git a/src/hb-gpu.cc b/src/hb-gpu.cc index d95171895..303ee51da 100644 --- a/src/hb-gpu.cc +++ b/src/hb-gpu.cc @@ -100,15 +100,10 @@ * directive and append your own main(): * * |[ - * unsigned vert_count, frag_count; - * const char * const *vert_lib = hb_gpu_shader_vertex_sources ( - * HB_GPU_SHADER_LANG_GLSL, &vert_count); - * const char * const *frag_lib = hb_gpu_shader_fragment_sources ( - * HB_GPU_SHADER_LANG_GLSL, &frag_count); - * * const char *vert_sources[] = { * "#version 330\n", - * hb_gpu_shader_vertex_source (HB_GPU_SHADER_LANG_GLSL), + * hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_VERTEX, + * HB_GPU_SHADER_LANG_GLSL), * your_vertex_main * }; * glShaderSource (vert_shader, 3, vert_sources, NULL); diff --git a/src/hb-gpu.h b/src/hb-gpu.h index 4f7f0a6e3..cb1a72f69 100644 --- a/src/hb-gpu.h +++ b/src/hb-gpu.h @@ -50,11 +50,23 @@ typedef enum { HB_GPU_SHADER_LANG_HLSL, } hb_gpu_shader_lang_t; -HB_EXTERN const char * -hb_gpu_shader_fragment_source (hb_gpu_shader_lang_t lang); +/** + * hb_gpu_shader_stage_t: + * @HB_GPU_SHADER_STAGE_VERTEX: Vertex shader stage. + * @HB_GPU_SHADER_STAGE_FRAGMENT: Fragment shader stage. + * + * Shader pipeline stage. + * + * XSince: REPLACEME + */ +typedef enum { + HB_GPU_SHADER_STAGE_VERTEX, + HB_GPU_SHADER_STAGE_FRAGMENT, +} hb_gpu_shader_stage_t; HB_EXTERN const char * -hb_gpu_shader_vertex_source (hb_gpu_shader_lang_t lang); +hb_gpu_draw_shader_source (hb_gpu_shader_stage_t stage, + hb_gpu_shader_lang_t lang); /** diff --git a/test/api/test-gpu.cc b/test/api/test-gpu.cc index 0d0f76d9f..0ded9faec 100644 --- a/test/api/test-gpu.cc +++ b/test/api/test-gpu.cc @@ -182,8 +182,8 @@ test_draw_funcs (void) static void test_shader_sources (void) { - g_assert_nonnull (hb_gpu_shader_fragment_source (HB_GPU_SHADER_LANG_GLSL)); - g_assert_nonnull (hb_gpu_shader_vertex_source (HB_GPU_SHADER_LANG_GLSL)); + g_assert_nonnull (hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_FRAGMENT, HB_GPU_SHADER_LANG_GLSL)); + g_assert_nonnull (hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_VERTEX, HB_GPU_SHADER_LANG_GLSL)); } static void diff --git a/util/gpu/demo-metal.mm b/util/gpu/demo-metal.mm index 8c3db9811..6e7dfb1d6 100644 --- a/util/gpu/demo-metal.mm +++ b/util/gpu/demo-metal.mm @@ -405,8 +405,8 @@ demo_renderer_create_metal (GLFWwindow *window) nswindow.contentView.wantsLayer = YES; /* Compile shaders */ - const char *vert_src = hb_gpu_shader_vertex_source (HB_GPU_SHADER_LANG_MSL); - const char *frag_src = hb_gpu_shader_fragment_source (HB_GPU_SHADER_LANG_MSL); + const char *vert_src = hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_VERTEX, HB_GPU_SHADER_LANG_MSL); + const char *frag_src = hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_FRAGMENT, HB_GPU_SHADER_LANG_MSL); NSString *preamble = @"#include \nusing namespace metal;\n"; NSString *source = [NSString stringWithFormat:@"%@%s%s%s", diff --git a/util/gpu/demo-renderer-d3d11.cc b/util/gpu/demo-renderer-d3d11.cc index 34d6c168b..8e9c3e88c 100644 --- a/util/gpu/demo-renderer-d3d11.cc +++ b/util/gpu/demo-renderer-d3d11.cc @@ -140,9 +140,9 @@ float4 ps_main (PSInput input) : SV_Target { std::string full; full += "StructuredBuffer hb_gpu_atlas : register(t0);\n"; - full += hb_gpu_shader_vertex_source (HB_GPU_SHADER_LANG_HLSL); + full += hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_VERTEX, HB_GPU_SHADER_LANG_HLSL); full += "\n"; - full += hb_gpu_shader_fragment_source (HB_GPU_SHADER_LANG_HLSL); + full += hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_FRAGMENT, HB_GPU_SHADER_LANG_HLSL); full += "\n"; full += hlsl_demo; diff --git a/util/gpu/demo-shader.cc b/util/gpu/demo-shader.cc index 9f50643ef..d971fa007 100644 --- a/util/gpu/demo-shader.cc +++ b/util/gpu/demo-shader.cc @@ -156,14 +156,14 @@ demo_shader_create_program (void) #endif const GLchar *vert_sources[] = {preamble, - hb_gpu_shader_vertex_source (HB_GPU_SHADER_LANG_GLSL), + hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_VERTEX, HB_GPU_SHADER_LANG_GLSL), demo_vertex_glsl}; vertex_shader = compile_shader (GL_VERTEX_SHADER, ARRAY_LEN (vert_sources), vert_sources); const GLchar *frag_sources[] = {preamble, - hb_gpu_shader_fragment_source (HB_GPU_SHADER_LANG_GLSL), + hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_FRAGMENT, HB_GPU_SHADER_LANG_GLSL), demo_fragment_glsl}; fragment_shader = compile_shader (GL_FRAGMENT_SHADER, ARRAY_LEN (frag_sources), diff --git a/util/gpu/web/hb-gpu-web-webgpu.cc b/util/gpu/web/hb-gpu-web-webgpu.cc index 6675a7ce6..a12294a24 100644 --- a/util/gpu/web/hb-gpu-web-webgpu.cc +++ b/util/gpu/web/hb-gpu-web-webgpu.cc @@ -831,9 +831,9 @@ static void create_pipeline () { std::string wgsl; - wgsl += hb_gpu_shader_vertex_source (HB_GPU_SHADER_LANG_WGSL); + wgsl += hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_VERTEX, HB_GPU_SHADER_LANG_WGSL); wgsl += "\n"; - wgsl += hb_gpu_shader_fragment_source (HB_GPU_SHADER_LANG_WGSL); + wgsl += hb_gpu_draw_shader_source (HB_GPU_SHADER_STAGE_FRAGMENT, HB_GPU_SHADER_LANG_WGSL); wgsl += "\n"; wgsl += wgsl_demo_shader;