diff options
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_shader.c')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_shader.c | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_shader.c b/source/blender/draw/engines/overlay/overlay_shader.c index 0610b8397a1..edf91c99531 100644 --- a/source/blender/draw/engines/overlay/overlay_shader.c +++ b/source/blender/draw/engines/overlay/overlay_shader.c @@ -31,6 +31,7 @@ extern char datatoc_antialiasing_frag_glsl[]; extern char datatoc_antialiasing_vert_glsl[]; extern char datatoc_armature_dof_vert_glsl[]; +extern char datatoc_armature_dof_solid_frag_glsl[]; extern char datatoc_armature_envelope_distance_frag_glsl[]; extern char datatoc_armature_envelope_outline_vert_glsl[]; extern char datatoc_armature_envelope_solid_frag_glsl[]; @@ -130,7 +131,8 @@ extern char datatoc_common_view_lib_glsl[]; typedef struct OVERLAY_Shaders { GPUShader *antialiasing; - GPUShader *armature_dof; + GPUShader *armature_dof_wire; + GPUShader *armature_dof_solid; GPUShader *armature_envelope_outline; GPUShader *armature_envelope_solid; GPUShader *armature_shape_outline; @@ -473,13 +475,13 @@ GPUShader *OVERLAY_shader_armature_stick(void) return sh_data->armature_stick; } -GPUShader *OVERLAY_shader_armature_degrees_of_freedom(void) +GPUShader *OVERLAY_shader_armature_degrees_of_freedom_wire(void) { const DRWContextState *draw_ctx = DRW_context_state_get(); const GPUShaderConfigData *sh_cfg = &GPU_shader_cfg_data[draw_ctx->sh_cfg]; OVERLAY_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg]; - if (!sh_data->armature_dof) { - sh_data->armature_dof = GPU_shader_create_from_arrays({ + if (!sh_data->armature_dof_wire) { + sh_data->armature_dof_wire = GPU_shader_create_from_arrays({ .vert = (const char *[]){sh_cfg->lib, datatoc_common_globals_lib_glsl, datatoc_common_view_lib_glsl, @@ -487,10 +489,31 @@ GPUShader *OVERLAY_shader_armature_degrees_of_freedom(void) NULL}, .frag = (const char *[]){datatoc_common_view_lib_glsl, datatoc_armature_wire_frag_glsl, NULL}, + .defs = (const char *[]){sh_cfg->def, "#define EDGE\n", NULL}, + }); + } + return sh_data->armature_dof_wire; +} + +GPUShader *OVERLAY_shader_armature_degrees_of_freedom_solid(void) +{ + const DRWContextState *draw_ctx = DRW_context_state_get(); + const GPUShaderConfigData *sh_cfg = &GPU_shader_cfg_data[draw_ctx->sh_cfg]; + OVERLAY_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg]; + if (!sh_data->armature_dof_solid) { + sh_data->armature_dof_solid = GPU_shader_create_from_arrays({ + .vert = (const char *[]){sh_cfg->lib, + datatoc_common_globals_lib_glsl, + datatoc_common_view_lib_glsl, + datatoc_armature_dof_vert_glsl, + NULL}, + .frag = (const char *[]){datatoc_common_view_lib_glsl, + datatoc_armature_dof_solid_frag_glsl, + NULL}, .defs = (const char *[]){sh_cfg->def, NULL}, }); } - return sh_data->armature_dof; + return sh_data->armature_dof_solid; } GPUShader *OVERLAY_shader_armature_wire(void) |