From 60a4e49aec1b5efdc67beef250c85d9af5c5cb79 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 13 Apr 2026 02:52:02 -0600 Subject: [PATCH] [gpu] Rename draw shader files/symbols with "draw-" prefix Rename hb-gpu-{fragment,vertex}.{glsl,msl,wgsl,hlsl} and their generated .hh artifacts to hb-gpu-draw-{fragment,vertex}.{glsl,msl, wgsl,hlsl}. Likewise rename the C symbols in each artifact from hb_gpu_{fragment,vertex}_ to hb_gpu_draw_{fragment,vertex}_. These are the shader sources for the hb_gpu_draw_t (Slug-style coverage) renderer. A COLRv1 paint renderer is planned and will introduce its own hb-gpu-paint-*.{glsl,...} shader family, so the existing shaders need a subsystem-qualified name to disambiguate. No behavior change; hb_gpu_draw_shader_source() keeps returning the same strings. Assisted-by: Claude Opus 4.6 (1M context) --- src/gen-gpu-shader-artifacts.py | 16 +++++----- ...t-glsl.hh => hb-gpu-draw-fragment-glsl.hh} | 2 +- ...t-hlsl.hh => hb-gpu-draw-fragment-hlsl.hh} | 2 +- ...ent-msl.hh => hb-gpu-draw-fragment-msl.hh} | 2 +- ...t-wgsl.hh => hb-gpu-draw-fragment-wgsl.hh} | 2 +- ...ragment.glsl => hb-gpu-draw-fragment.glsl} | 0 ...ragment.hlsl => hb-gpu-draw-fragment.hlsl} | 0 ...-fragment.msl => hb-gpu-draw-fragment.msl} | 0 ...ragment.wgsl => hb-gpu-draw-fragment.wgsl} | 0 ...tex-glsl.hh => hb-gpu-draw-vertex-glsl.hh} | 2 +- ...tex-hlsl.hh => hb-gpu-draw-vertex-hlsl.hh} | 2 +- ...ertex-msl.hh => hb-gpu-draw-vertex-msl.hh} | 2 +- ...tex-wgsl.hh => hb-gpu-draw-vertex-wgsl.hh} | 2 +- ...pu-vertex.glsl => hb-gpu-draw-vertex.glsl} | 0 ...pu-vertex.hlsl => hb-gpu-draw-vertex.hlsl} | 0 ...-gpu-vertex.msl => hb-gpu-draw-vertex.msl} | 0 ...pu-vertex.wgsl => hb-gpu-draw-vertex.wgsl} | 0 src/hb-gpu-shaders.cc | 32 +++++++++---------- src/meson.build | 16 +++++----- 19 files changed, 40 insertions(+), 40 deletions(-) rename src/{hb-gpu-fragment-glsl.hh => hb-gpu-draw-fragment-glsl.hh} (99%) rename src/{hb-gpu-fragment-hlsl.hh => hb-gpu-draw-fragment-hlsl.hh} (99%) rename src/{hb-gpu-fragment-msl.hh => hb-gpu-draw-fragment-msl.hh} (99%) rename src/{hb-gpu-fragment-wgsl.hh => hb-gpu-draw-fragment-wgsl.hh} (99%) rename src/{hb-gpu-fragment.glsl => hb-gpu-draw-fragment.glsl} (100%) rename src/{hb-gpu-fragment.hlsl => hb-gpu-draw-fragment.hlsl} (100%) rename src/{hb-gpu-fragment.msl => hb-gpu-draw-fragment.msl} (100%) rename src/{hb-gpu-fragment.wgsl => hb-gpu-draw-fragment.wgsl} (100%) rename src/{hb-gpu-vertex-glsl.hh => hb-gpu-draw-vertex-glsl.hh} (98%) rename src/{hb-gpu-vertex-hlsl.hh => hb-gpu-draw-vertex-hlsl.hh} (98%) rename src/{hb-gpu-vertex-msl.hh => hb-gpu-draw-vertex-msl.hh} (98%) rename src/{hb-gpu-vertex-wgsl.hh => hb-gpu-draw-vertex-wgsl.hh} (98%) rename src/{hb-gpu-vertex.glsl => hb-gpu-draw-vertex.glsl} (100%) rename src/{hb-gpu-vertex.hlsl => hb-gpu-draw-vertex.hlsl} (100%) rename src/{hb-gpu-vertex.msl => hb-gpu-draw-vertex.msl} (100%) rename src/{hb-gpu-vertex.wgsl => hb-gpu-draw-vertex.wgsl} (100%) diff --git a/src/gen-gpu-shader-artifacts.py b/src/gen-gpu-shader-artifacts.py index 1ba2739f7..a1420c842 100755 --- a/src/gen-gpu-shader-artifacts.py +++ b/src/gen-gpu-shader-artifacts.py @@ -13,14 +13,14 @@ INPUT = sys.argv[3] hh = os.path.basename(OUTPUT) decl_map = { - 'hb-gpu-fragment-glsl.hh': 'hb_gpu_fragment_glsl', - 'hb-gpu-vertex-glsl.hh': 'hb_gpu_vertex_glsl', - 'hb-gpu-fragment-msl.hh': 'hb_gpu_fragment_msl', - 'hb-gpu-vertex-msl.hh': 'hb_gpu_vertex_msl', - 'hb-gpu-fragment-wgsl.hh': 'hb_gpu_fragment_wgsl', - 'hb-gpu-vertex-wgsl.hh': 'hb_gpu_vertex_wgsl', - 'hb-gpu-fragment-hlsl.hh': 'hb_gpu_fragment_hlsl', - 'hb-gpu-vertex-hlsl.hh': 'hb_gpu_vertex_hlsl', + 'hb-gpu-draw-fragment-glsl.hh': 'hb_gpu_draw_fragment_glsl', + 'hb-gpu-draw-vertex-glsl.hh': 'hb_gpu_draw_vertex_glsl', + 'hb-gpu-draw-fragment-msl.hh': 'hb_gpu_draw_fragment_msl', + 'hb-gpu-draw-vertex-msl.hh': 'hb_gpu_draw_vertex_msl', + 'hb-gpu-draw-fragment-wgsl.hh': 'hb_gpu_draw_fragment_wgsl', + 'hb-gpu-draw-vertex-wgsl.hh': 'hb_gpu_draw_vertex_wgsl', + 'hb-gpu-draw-fragment-hlsl.hh': 'hb_gpu_draw_fragment_hlsl', + 'hb-gpu-draw-vertex-hlsl.hh': 'hb_gpu_draw_vertex_hlsl', } decl = decl_map.get(hh) diff --git a/src/hb-gpu-fragment-glsl.hh b/src/hb-gpu-draw-fragment-glsl.hh similarity index 99% rename from src/hb-gpu-fragment-glsl.hh rename to src/hb-gpu-draw-fragment-glsl.hh index 0e2597253..141b80c5a 100644 --- a/src/hb-gpu-fragment-glsl.hh +++ b/src/hb-gpu-draw-fragment-glsl.hh @@ -1,4 +1,4 @@ -static const char *hb_gpu_fragment_glsl = +static const char *hb_gpu_draw_fragment_glsl = "/*\n" " * Copyright (C) 2026 Behdad Esfahbod\n" " * Copyright (C) 2017 Eric Lengyel\n" diff --git a/src/hb-gpu-fragment-hlsl.hh b/src/hb-gpu-draw-fragment-hlsl.hh similarity index 99% rename from src/hb-gpu-fragment-hlsl.hh rename to src/hb-gpu-draw-fragment-hlsl.hh index 206cc19fe..a76b1932b 100644 --- a/src/hb-gpu-fragment-hlsl.hh +++ b/src/hb-gpu-draw-fragment-hlsl.hh @@ -1,4 +1,4 @@ -static const char *hb_gpu_fragment_hlsl = +static const char *hb_gpu_draw_fragment_hlsl = "/*\n" " * Copyright (C) 2026 Behdad Esfahbod\n" " * Copyright (C) 2017 Eric Lengyel\n" diff --git a/src/hb-gpu-fragment-msl.hh b/src/hb-gpu-draw-fragment-msl.hh similarity index 99% rename from src/hb-gpu-fragment-msl.hh rename to src/hb-gpu-draw-fragment-msl.hh index b8c88b76c..9472aa564 100644 --- a/src/hb-gpu-fragment-msl.hh +++ b/src/hb-gpu-draw-fragment-msl.hh @@ -1,4 +1,4 @@ -static const char *hb_gpu_fragment_msl = +static const char *hb_gpu_draw_fragment_msl = "/*\n" " * Copyright (C) 2026 Behdad Esfahbod\n" " * Copyright (C) 2017 Eric Lengyel\n" diff --git a/src/hb-gpu-fragment-wgsl.hh b/src/hb-gpu-draw-fragment-wgsl.hh similarity index 99% rename from src/hb-gpu-fragment-wgsl.hh rename to src/hb-gpu-draw-fragment-wgsl.hh index d06e3c5f8..d70a76933 100644 --- a/src/hb-gpu-fragment-wgsl.hh +++ b/src/hb-gpu-draw-fragment-wgsl.hh @@ -1,4 +1,4 @@ -static const char *hb_gpu_fragment_wgsl = +static const char *hb_gpu_draw_fragment_wgsl = "/*\n" " * Copyright (C) 2026 Behdad Esfahbod\n" " * Copyright (C) 2017 Eric Lengyel\n" diff --git a/src/hb-gpu-fragment.glsl b/src/hb-gpu-draw-fragment.glsl similarity index 100% rename from src/hb-gpu-fragment.glsl rename to src/hb-gpu-draw-fragment.glsl diff --git a/src/hb-gpu-fragment.hlsl b/src/hb-gpu-draw-fragment.hlsl similarity index 100% rename from src/hb-gpu-fragment.hlsl rename to src/hb-gpu-draw-fragment.hlsl diff --git a/src/hb-gpu-fragment.msl b/src/hb-gpu-draw-fragment.msl similarity index 100% rename from src/hb-gpu-fragment.msl rename to src/hb-gpu-draw-fragment.msl diff --git a/src/hb-gpu-fragment.wgsl b/src/hb-gpu-draw-fragment.wgsl similarity index 100% rename from src/hb-gpu-fragment.wgsl rename to src/hb-gpu-draw-fragment.wgsl diff --git a/src/hb-gpu-vertex-glsl.hh b/src/hb-gpu-draw-vertex-glsl.hh similarity index 98% rename from src/hb-gpu-vertex-glsl.hh rename to src/hb-gpu-draw-vertex-glsl.hh index 85427432c..2cf371aec 100644 --- a/src/hb-gpu-vertex-glsl.hh +++ b/src/hb-gpu-draw-vertex-glsl.hh @@ -1,4 +1,4 @@ -static const char *hb_gpu_vertex_glsl = +static const char *hb_gpu_draw_vertex_glsl = "/*\n" " * Copyright (C) 2026 Behdad Esfahbod\n" " * Copyright (C) 2017 Eric Lengyel\n" diff --git a/src/hb-gpu-vertex-hlsl.hh b/src/hb-gpu-draw-vertex-hlsl.hh similarity index 98% rename from src/hb-gpu-vertex-hlsl.hh rename to src/hb-gpu-draw-vertex-hlsl.hh index 5fa003871..559595108 100644 --- a/src/hb-gpu-vertex-hlsl.hh +++ b/src/hb-gpu-draw-vertex-hlsl.hh @@ -1,4 +1,4 @@ -static const char *hb_gpu_vertex_hlsl = +static const char *hb_gpu_draw_vertex_hlsl = "/*\n" " * Copyright (C) 2026 Behdad Esfahbod\n" " * Copyright (C) 2017 Eric Lengyel\n" diff --git a/src/hb-gpu-vertex-msl.hh b/src/hb-gpu-draw-vertex-msl.hh similarity index 98% rename from src/hb-gpu-vertex-msl.hh rename to src/hb-gpu-draw-vertex-msl.hh index bfdd403f9..9bf623e6a 100644 --- a/src/hb-gpu-vertex-msl.hh +++ b/src/hb-gpu-draw-vertex-msl.hh @@ -1,4 +1,4 @@ -static const char *hb_gpu_vertex_msl = +static const char *hb_gpu_draw_vertex_msl = "/*\n" " * Copyright (C) 2026 Behdad Esfahbod\n" " * Copyright (C) 2017 Eric Lengyel\n" diff --git a/src/hb-gpu-vertex-wgsl.hh b/src/hb-gpu-draw-vertex-wgsl.hh similarity index 98% rename from src/hb-gpu-vertex-wgsl.hh rename to src/hb-gpu-draw-vertex-wgsl.hh index e270d3775..3b8d6de84 100644 --- a/src/hb-gpu-vertex-wgsl.hh +++ b/src/hb-gpu-draw-vertex-wgsl.hh @@ -1,4 +1,4 @@ -static const char *hb_gpu_vertex_wgsl = +static const char *hb_gpu_draw_vertex_wgsl = "/*\n" " * Copyright (C) 2026 Behdad Esfahbod\n" " * Copyright (C) 2017 Eric Lengyel\n" diff --git a/src/hb-gpu-vertex.glsl b/src/hb-gpu-draw-vertex.glsl similarity index 100% rename from src/hb-gpu-vertex.glsl rename to src/hb-gpu-draw-vertex.glsl diff --git a/src/hb-gpu-vertex.hlsl b/src/hb-gpu-draw-vertex.hlsl similarity index 100% rename from src/hb-gpu-vertex.hlsl rename to src/hb-gpu-draw-vertex.hlsl diff --git a/src/hb-gpu-vertex.msl b/src/hb-gpu-draw-vertex.msl similarity index 100% rename from src/hb-gpu-vertex.msl rename to src/hb-gpu-draw-vertex.msl diff --git a/src/hb-gpu-vertex.wgsl b/src/hb-gpu-draw-vertex.wgsl similarity index 100% rename from src/hb-gpu-vertex.wgsl rename to src/hb-gpu-draw-vertex.wgsl diff --git a/src/hb-gpu-shaders.cc b/src/hb-gpu-shaders.cc index 05fa470db..62d7197b2 100644 --- a/src/hb-gpu-shaders.cc +++ b/src/hb-gpu-shaders.cc @@ -28,14 +28,14 @@ #include "hb-gpu.h" -#include "hb-gpu-fragment-glsl.hh" -#include "hb-gpu-vertex-glsl.hh" -#include "hb-gpu-fragment-msl.hh" -#include "hb-gpu-vertex-msl.hh" -#include "hb-gpu-fragment-wgsl.hh" -#include "hb-gpu-vertex-wgsl.hh" -#include "hb-gpu-fragment-hlsl.hh" -#include "hb-gpu-vertex-hlsl.hh" +#include "hb-gpu-draw-fragment-glsl.hh" +#include "hb-gpu-draw-vertex-glsl.hh" +#include "hb-gpu-draw-fragment-msl.hh" +#include "hb-gpu-draw-vertex-msl.hh" +#include "hb-gpu-draw-fragment-wgsl.hh" +#include "hb-gpu-draw-vertex-wgsl.hh" +#include "hb-gpu-draw-fragment-hlsl.hh" +#include "hb-gpu-draw-vertex-hlsl.hh" /** @@ -64,18 +64,18 @@ hb_gpu_draw_shader_source (hb_gpu_shader_stage_t stage, 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; + case HB_GPU_SHADER_LANG_GLSL: return hb_gpu_draw_fragment_glsl; + case HB_GPU_SHADER_LANG_MSL: return hb_gpu_draw_fragment_msl; + case HB_GPU_SHADER_LANG_WGSL: return hb_gpu_draw_fragment_wgsl; + case HB_GPU_SHADER_LANG_HLSL: return hb_gpu_draw_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; + case HB_GPU_SHADER_LANG_GLSL: return hb_gpu_draw_vertex_glsl; + case HB_GPU_SHADER_LANG_MSL: return hb_gpu_draw_vertex_msl; + case HB_GPU_SHADER_LANG_WGSL: return hb_gpu_draw_vertex_wgsl; + case HB_GPU_SHADER_LANG_HLSL: return hb_gpu_draw_vertex_hlsl; default: return nullptr; } default: diff --git a/src/meson.build b/src/meson.build index c4a4208bc..6fac16097 100644 --- a/src/meson.build +++ b/src/meson.build @@ -825,14 +825,14 @@ if not get_option('vector').disabled() endif hb_gpu_shader_sources = [ - [ 'hb-gpu-fragment.glsl', 'hb-gpu-fragment-glsl.hh' ], - [ 'hb-gpu-vertex.glsl', 'hb-gpu-vertex-glsl.hh' ], - [ 'hb-gpu-fragment.wgsl', 'hb-gpu-fragment-wgsl.hh' ], - [ 'hb-gpu-vertex.wgsl', 'hb-gpu-vertex-wgsl.hh' ], - [ 'hb-gpu-fragment.msl', 'hb-gpu-fragment-msl.hh' ], - [ 'hb-gpu-vertex.msl', 'hb-gpu-vertex-msl.hh' ], - [ 'hb-gpu-fragment.hlsl', 'hb-gpu-fragment-hlsl.hh' ], - [ 'hb-gpu-vertex.hlsl', 'hb-gpu-vertex-hlsl.hh' ], + [ 'hb-gpu-draw-fragment.glsl', 'hb-gpu-draw-fragment-glsl.hh' ], + [ 'hb-gpu-draw-vertex.glsl', 'hb-gpu-draw-vertex-glsl.hh' ], + [ 'hb-gpu-draw-fragment.wgsl', 'hb-gpu-draw-fragment-wgsl.hh' ], + [ 'hb-gpu-draw-vertex.wgsl', 'hb-gpu-draw-vertex-wgsl.hh' ], + [ 'hb-gpu-draw-fragment.msl', 'hb-gpu-draw-fragment-msl.hh' ], + [ 'hb-gpu-draw-vertex.msl', 'hb-gpu-draw-vertex-msl.hh' ], + [ 'hb-gpu-draw-fragment.hlsl', 'hb-gpu-draw-fragment-hlsl.hh' ], + [ 'hb-gpu-draw-vertex.hlsl', 'hb-gpu-draw-vertex-hlsl.hh' ], ] hb_gpu_shader_helper = find_program('gen-gpu-shader-artifacts.py')