diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-04-24 00:08:20 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-04-24 00:08:20 +0300 |
| commit | 826f6dd9ee20332585f808a41c487c94a590265f (patch) | |
| tree | 8ad92e3c3a58e58904c8f19186c54a6be09590ce /source/blender/gpu/intern | |
| parent | ed4f33a7bd3ed185f9b863a92673b3319c1890fe (diff) | |
| parent | d712f1f83af881be536ec0d183b7d3025c172684 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/gpu/intern')
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index 3c2266bd65d..8dfc992ae9f 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -88,6 +88,9 @@ extern char datatoc_gpu_shader_image_modulate_alpha_frag_glsl[]; extern char datatoc_gpu_shader_3D_vert_glsl[]; extern char datatoc_gpu_shader_3D_normal_vert_glsl[]; extern char datatoc_gpu_shader_3D_flat_color_vert_glsl[]; +extern char datatoc_gpu_shader_3D_polyline_frag_glsl[]; +extern char datatoc_gpu_shader_3D_polyline_geom_glsl[]; +extern char datatoc_gpu_shader_3D_polyline_vert_glsl[]; extern char datatoc_gpu_shader_3D_smooth_color_vert_glsl[]; extern char datatoc_gpu_shader_3D_smooth_color_frag_glsl[]; extern char datatoc_gpu_shader_3D_passthrough_vert_glsl[]; @@ -1026,6 +1029,36 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = { .frag = datatoc_gpu_shader_uniform_color_frag_glsl, }, + [GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR] = + { + .vert = datatoc_gpu_shader_3D_polyline_vert_glsl, + .geom = datatoc_gpu_shader_3D_polyline_geom_glsl, + .frag = datatoc_gpu_shader_3D_polyline_frag_glsl, + .defs = "#define UNIFORM\n", + }, + [GPU_SHADER_3D_POLYLINE_CLIPPED_UNIFORM_COLOR] = + { + .vert = datatoc_gpu_shader_3D_polyline_vert_glsl, + .geom = datatoc_gpu_shader_3D_polyline_geom_glsl, + .frag = datatoc_gpu_shader_3D_polyline_frag_glsl, + .defs = "#define UNIFORM\n" + "#define CLIP\n", + }, + [GPU_SHADER_3D_POLYLINE_FLAT_COLOR] = + { + .vert = datatoc_gpu_shader_3D_polyline_vert_glsl, + .geom = datatoc_gpu_shader_3D_polyline_geom_glsl, + .frag = datatoc_gpu_shader_3D_polyline_frag_glsl, + .defs = "#define FLAT\n", + }, + [GPU_SHADER_3D_POLYLINE_SMOOTH_COLOR] = + { + .vert = datatoc_gpu_shader_3D_polyline_vert_glsl, + .geom = datatoc_gpu_shader_3D_polyline_geom_glsl, + .frag = datatoc_gpu_shader_3D_polyline_frag_glsl, + .defs = "#define SMOOTH\n", + }, + [GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR] = { .vert = datatoc_gpu_shader_2D_line_dashed_uniform_color_vert_glsl, |