[Bf-blender-cvs] [3cc60bbbc14] soc-2019-npr: LANPR: Fix GPU texture init errors.

[YimingWu]

Commit: 3cc60bbbc14612b1d63c8f00a006efb4d059f8ff
Author: YimingWu
Date:   Thu Aug 1 17:21:44 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB3cc60bbbc14612b1d63c8f00a006efb4d059f8ff

LANPR: Fix GPU texture init errors.

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

M	source/blender/draw/engines/lanpr/lanpr_engine.c

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 96b0b90bf08..cc10c060694 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -59,15 +59,6 @@ static void lanpr_engine_init(void *ved)
   }
 
 #if 0 /* Deprecated: snake mode */
-  DRW_texture_ensure_fullscreen_2D_multisample(&txl->depth, GPU_DEPTH_COMPONENT32F, 8, 0);
-  DRW_texture_ensure_fullscreen_2D_multisample(&txl->color, GPU_RGBA32F, 8, 0);
-  DRW_texture_ensure_fullscreen_2D_multisample(&txl->normal, GPU_RGBA32F, 8, 0);
-  DRW_texture_ensure_fullscreen_2D_multisample(&txl->edge_intermediate, GPU_RGBA32F, 8, 0);
-
-  GPU_framebuffer_ensure_config(&fbl->edge_intermediate,
-                                {GPU_ATTACHMENT_TEXTURE(txl->depth),
-                                 GPU_ATTACHMENT_TEXTURE(txl->edge_intermediate)});
-
   GPU_framebuffer_ensure_config(&fbl->edge_thinning,
                                 {GPU_ATTACHMENT_LEAVE,
                                  GPU_ATTACHMENT_TEXTURE(txl->color)});
@@ -89,6 +80,11 @@ static void lanpr_engine_init(void *ved)
   }
 #endif
 
+  DRW_texture_ensure_fullscreen_2D_multisample(&txl->depth, GPU_DEPTH_COMPONENT32F, 8, 0);
+  DRW_texture_ensure_fullscreen_2D_multisample(&txl->color, GPU_RGBA32F, 8, 0);
+  DRW_texture_ensure_fullscreen_2D_multisample(&txl->normal, GPU_RGBA32F, 8, 0);
+  DRW_texture_ensure_fullscreen_2D_multisample(&txl->edge_intermediate, GPU_RGBA32F, 8, 0);
+
   DRW_texture_ensure_fullscreen_2D_multisample(
       &txl->ms_resolve_depth, GPU_DEPTH_COMPONENT32F, 8, 0);
   DRW_texture_ensure_fullscreen_2D_multisample(&txl->ms_resolve_color, GPU_RGBA32F, 8, 0);
@@ -98,6 +94,10 @@ static void lanpr_engine_init(void *ved)
                                  GPU_ATTACHMENT_TEXTURE(txl->color),
                                  GPU_ATTACHMENT_TEXTURE(txl->normal)});
 
+  GPU_framebuffer_ensure_config(&fbl->edge_intermediate,
+                                {GPU_ATTACHMENT_TEXTURE(txl->depth),
+                                 GPU_ATTACHMENT_TEXTURE(txl->edge_intermediate)});
+
   if (!lanpr_share.multichannel_shader) {
     lanpr_share.multichannel_shader = DRW_shader_create(
         datatoc_gpu_shader_3D_smooth_color_vert_glsl,