Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2022-03-19 15:06:16 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-03-20 00:05:34 +0300
commit84a0e04296f7f0474f24da526adfe43a581d32e2 (patch)
treef1f76509d63f529eb56243d4cacdaf9b68662888 /source/blender/draw/engines/gpencil/gpencil_shader.c
parent568c453ff384302b8c029fd8ce25a14993587a44 (diff)
GPencil: Use ShaderCreateInfo for fullscreen shaders
Simple port. Shouldn't break anything.
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_shader.c')
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_shader.c31
1 files changed, 3 insertions, 28 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_shader.c b/source/blender/draw/engines/gpencil/gpencil_shader.c
index c37225d84de..fca2e700346 100644
--- a/source/blender/draw/engines/gpencil/gpencil_shader.c
+++ b/source/blender/draw/engines/gpencil/gpencil_shader.c
@@ -136,19 +136,7 @@ GPUShader *GPENCIL_shader_geometry_get(void)
GPUShader *GPENCIL_shader_layer_blend_get(void)
{
if (!g_shaders.layer_blend_sh) {
- g_shaders.layer_blend_sh = GPU_shader_create_from_arrays({
- .vert =
- (const char *[]){
- datatoc_common_fullscreen_vert_glsl,
- NULL,
- },
- .frag =
- (const char *[]){
- datatoc_gpencil_common_lib_glsl,
- datatoc_gpencil_layer_blend_frag_glsl,
- NULL,
- },
- });
+ g_shaders.layer_blend_sh = GPU_shader_create_from_info_name("gpencil_layer_blend");
}
return g_shaders.layer_blend_sh;
}
@@ -156,8 +144,7 @@ GPUShader *GPENCIL_shader_layer_blend_get(void)
GPUShader *GPENCIL_shader_mask_invert_get(void)
{
if (!g_shaders.mask_invert_sh) {
- g_shaders.mask_invert_sh = DRW_shader_create_fullscreen(datatoc_gpencil_mask_invert_frag_glsl,
- NULL);
+ g_shaders.mask_invert_sh = GPU_shader_create_from_info_name("gpencil_mask_invert");
}
return g_shaders.mask_invert_sh;
}
@@ -165,19 +152,7 @@ GPUShader *GPENCIL_shader_mask_invert_get(void)
GPUShader *GPENCIL_shader_depth_merge_get(void)
{
if (!g_shaders.depth_merge_sh) {
- g_shaders.depth_merge_sh = GPU_shader_create_from_arrays({
- .vert =
- (const char *[]){
- datatoc_common_view_lib_glsl,
- datatoc_gpencil_depth_merge_vert_glsl,
- NULL,
- },
- .frag =
- (const char *[]){
- datatoc_gpencil_depth_merge_frag_glsl,
- NULL,
- },
- });
+ g_shaders.depth_merge_sh = GPU_shader_create_from_info_name("gpencil_depth_merge");
}
return g_shaders.depth_merge_sh;
}