[Bf-blender-cvs] [9b06c78676a] soc-2018-npr: Adapted multisample functions.

[Nick Wu]

Commit: 9b06c78676ad170d971a0f69ddd4e48c10b0db79
Author: Nick Wu
Date:   Wed Aug 1 12:08:05 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB9b06c78676ad170d971a0f69ddd4e48c10b0db79

Adapted multisample functions.

===================================================================

M	source/blender/draw/engines/lanpr/lanpr_dpix.c
M	source/blender/draw/engines/lanpr/lanpr_ops.c
M	source/blender/draw/engines/lanpr/lanpr_snake.c

===================================================================

diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index 8cde4080125..d9154e86b9c 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -386,5 +386,5 @@ void lanpr_dpix_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl, L
 
 	GPU_framebuffer_bind(DefaultFB);
 	GPU_framebuffer_clear(DefaultFB, clear_bits, lanpr->background_color, clear_depth, clear_stencil);
-	DRW_multisamples_resolve(txl->depth, txl->color);
+	DRW_multisamples_resolve(txl->depth, txl->color, 1);
 }
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index a5beb05368c..1fe09093ac5 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -2982,7 +2982,7 @@ void lanpr_viewport_draw_offline_result(LANPR_TextureList *txl, LANPR_Framebuffe
 
 	GPU_framebuffer_bind(dfbl->default_fb);
 	GPU_framebuffer_clear(dfbl->default_fb, clear_bits, lanpr->background_color, clear_depth, clear_stencil);
-	DRW_multisamples_resolve(txl->depth, txl->color);
+	DRW_multisamples_resolve(txl->depth, txl->color, 1);
 }
 
 
diff --git a/source/blender/draw/engines/lanpr/lanpr_snake.c b/source/blender/draw/engines/lanpr/lanpr_snake.c
index 4843d831af3..fcb3b0552b8 100644
--- a/source/blender/draw/engines/lanpr/lanpr_snake.c
+++ b/source/blender/draw/engines/lanpr/lanpr_snake.c
@@ -349,7 +349,7 @@ void lanpr_snake_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl,
 
 	if ((!lanpr->enable_vector_trace) && (!lanpr->display_thinning_result)) {
 		GPU_framebuffer_bind(DefaultFB);
-		DRW_multisamples_resolve(txl->depth, txl->edge_intermediate);
+		DRW_multisamples_resolve(txl->depth, txl->edge_intermediate, 1);
 		return;
 	}
 
@@ -357,30 +357,30 @@ void lanpr_snake_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl,
 		pd->stage = 0;
 
 		GPU_framebuffer_bind(DefaultFB);
-		DRW_multisamples_resolve(txl->depth, txl->edge_intermediate);
+		DRW_multisamples_resolve(txl->depth, txl->edge_intermediate, 1);
 
 		GPU_framebuffer_bind(fbl->edge_thinning);
 		DRW_draw_pass(psl->edge_thinning);
 		GPU_framebuffer_bind(DefaultFB);
-		DRW_multisamples_resolve(txl->depth, txl->color);
+		DRW_multisamples_resolve(txl->depth, txl->color, 1);
 
 		pd->stage = 1;
 		GPU_framebuffer_bind(fbl->edge_thinning);
 		DRW_draw_pass(psl->edge_thinning);
 		GPU_framebuffer_bind(DefaultFB);
-		DRW_multisamples_resolve(txl->depth, txl->color);
+		DRW_multisamples_resolve(txl->depth, txl->color, 1);
 
 		pd->stage = 0;
 		GPU_framebuffer_bind(fbl->edge_thinning);
 		DRW_draw_pass(psl->edge_thinning);
 		GPU_framebuffer_bind(DefaultFB);
-		DRW_multisamples_resolve(txl->depth, txl->color);
+		DRW_multisamples_resolve(txl->depth, txl->color, 1);
 
 		pd->stage = 1;
 		GPU_framebuffer_bind(fbl->edge_thinning);
 		DRW_draw_pass(psl->edge_thinning);
 		GPU_framebuffer_bind(DefaultFB);
-		DRW_multisamples_resolve(txl->depth, txl->color);
+		DRW_multisamples_resolve(txl->depth, txl->color, 1);
 
 		if (!lanpr->enable_vector_trace) return;
 	}
@@ -485,6 +485,6 @@ void lanpr_snake_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl,
 	pd->line_strips.first = pd->line_strips.last = 0;
 
 	GPU_framebuffer_bind(DefaultFB);
-	DRW_multisamples_resolve(txl->depth, txl->edge_intermediate);
+	DRW_multisamples_resolve(txl->depth, txl->edge_intermediate, 1);
 }