mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-20 22:41:10 +01:00
[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}_<lang> to hb_gpu_draw_{fragment,vertex}_<lang>.
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) <noreply@anthropic.com>
This commit is contained in:
1 parent
83c7371098
commit
60a4e49aec
19 files changed
+40
-40
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
@@ -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"
|
||||
@@ -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"
|
||||
@@ -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"
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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"
|
||||
@@ -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"
|
||||
@@ -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"
|
||||
@@ -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"
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+16
-16
@@ -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:
|
||||
|
||||
+8
-8
@@ -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')
|
||||
|
||||
Reference in new issue
Block a user