Commit: 80e3a977442214cc63a4ce28cb5d8404a62b733a
Author: Nick Wu
Date: Sat Aug 4 09:53:03 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB80e3a977442214cc63a4ce28cb5d8404a62b733a
Adapted shader APIs to DRW_
===================================================================
M source/blender/draw/engines/lanpr/lanpr_dpix.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c
b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index 131ee3e6fad..6f27be1bf2e 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -78,18 +78,19 @@ void lanpr_init_atlas_inputs(void *ved){
if (!lanpr_share.dpix_transform_shader) {
lanpr_share.dpix_transform_shader =
- GPU_shader_create(
+ DRW_shader_create(
datatoc_lanpr_dpix_project_passthrough_vert_glsl,
+ NULL,
datatoc_lanpr_dpix_project_clip_frag_glsl,
- NULL, NULL, NULL);
+ NULL);
}
if (!lanpr_share.dpix_preview_shader) {
lanpr_share.dpix_preview_shader =
- GPU_shader_create(
+ DRW_shader_create(
datatoc_lanpr_dpix_project_passthrough_vert_glsl,
- datatoc_lanpr_dpix_preview_frag_glsl,
datatoc_lanpr_dpix_preview_geom_glsl,
- NULL, NULL);
+ datatoc_lanpr_dpix_preview_frag_glsl,
+ NULL);
}
}
void lanpr_destroy_atlas(void *ved){
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c
b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 5bcb7ae1a61..daa141b539b 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -107,32 +107,38 @@ static void lanpr_engine_init(void *ved){
if (!lanpr_share.multichannel_shader) {
lanpr_share.multichannel_shader =
- GPU_shader_create(
+ DRW_shader_create(
datatoc_gpu_shader_3D_normal_smooth_color_vert_glsl,
- datatoc_lanpr_snake_multichannel_frag_glsl,
NULL, NULL, NULL);
+ NULL,
+ datatoc_lanpr_snake_multichannel_frag_glsl,
+ NULL);
}
if (!lanpr_share.edge_detect_shader) {
lanpr_share.edge_detect_shader =
- GPU_shader_create(
+ DRW_shader_create(
datatoc_common_fullscreen_vert_glsl,
- datatoc_lanpr_snake_edge_frag_glsl, NULL, NULL,
NULL);
+ NULL,
+ datatoc_lanpr_snake_edge_frag_glsl,
+ NULL);
}
if (!lanpr_share.edge_thinning_shader) {
lanpr_share.edge_thinning_shader =
- GPU_shader_create(
+ DRW_shader_create(
datatoc_common_fullscreen_vert_glsl,
- datatoc_lanpr_snake_image_peel_frag_glsl, NULL,
NULL, NULL);
+ NULL,
+ datatoc_lanpr_snake_image_peel_frag_glsl,
+ NULL);
}
if (!lanpr_share.snake_connection_shader) {
lanpr_share.snake_connection_shader =
- GPU_shader_create(
+ DRW_shader_create(
datatoc_lanpr_snake_line_connection_vert_glsl,
- datatoc_lanpr_snake_line_connection_frag_glsl,
datatoc_lanpr_snake_line_connection_geom_glsl,
- NULL, NULL);
+ datatoc_lanpr_snake_line_connection_frag_glsl,
+ NULL);
}
/* DPIX */
@@ -141,20 +147,20 @@ static void lanpr_engine_init(void *ved){
/* SOFTWARE */
if (!lanpr_share.software_shader) {
lanpr_share.software_shader =
- GPU_shader_create(
+ DRW_shader_create(
datatoc_lanpr_software_passthrough_vert_glsl,
- datatoc_lanpr_dpix_preview_frag_glsl,
datatoc_lanpr_software_line_chain_geom_glsl,
- NULL, NULL);
+ datatoc_lanpr_dpix_preview_frag_glsl,
+ NULL);
}
if (!lanpr_share.software_chaining_shader) {
lanpr_share.software_chaining_shader =
- GPU_shader_create(
+ DRW_shader_create(
datatoc_lanpr_software_passthrough_vert_glsl,
- datatoc_lanpr_dpix_preview_frag_glsl,
datatoc_lanpr_software_chain_geom_glsl,
- NULL, NULL);
+ datatoc_lanpr_dpix_preview_frag_glsl,
+ NULL);
}
GPU_framebuffer_ensure_config(&fbl->software_ms, {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
