[Bf-blender-cvs] [9b0c3c39a6c] soc-2019-npr: LANPR: Remove useless GPU_ATTACHMENT_LEAVE flags.

YimingWu noreply at git.blender.org
Fri Jul 19 11:03:45 CEST 2019


Commit: 9b0c3c39a6c08de19896ecd7e29c28f3c71db0f6
Author: YimingWu
Date:   Fri Jul 19 17:03:06 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB9b0c3c39a6c08de19896ecd7e29c28f3c71db0f6

LANPR: Remove useless GPU_ATTACHMENT_LEAVE flags.

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

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 cd028d1fe4a..cb369e63198 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -82,29 +82,15 @@ static void lanpr_engine_init(void *ved)
   GPU_framebuffer_ensure_config(&fbl->passes,
                                 {GPU_ATTACHMENT_TEXTURE(txl->depth),
                                  GPU_ATTACHMENT_TEXTURE(txl->color),
-                                 GPU_ATTACHMENT_TEXTURE(txl->normal),
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE});
+                                 GPU_ATTACHMENT_TEXTURE(txl->normal)});
 
   GPU_framebuffer_ensure_config(&fbl->edge_intermediate,
                                 {GPU_ATTACHMENT_TEXTURE(txl->depth),
-                                 GPU_ATTACHMENT_TEXTURE(txl->edge_intermediate),
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE});
+                                 GPU_ATTACHMENT_TEXTURE(txl->edge_intermediate)});
 
   GPU_framebuffer_ensure_config(&fbl->edge_thinning,
                                 {GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_TEXTURE(txl->color),
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE});
+                                 GPU_ATTACHMENT_TEXTURE(txl->color)});
 
   if (!lanpr_share.multichannel_shader) {
     lanpr_share.multichannel_shader = DRW_shader_create(
@@ -150,12 +136,7 @@ static void lanpr_engine_init(void *ved)
 
   GPU_framebuffer_ensure_config(&fbl->software_ms,
                                 {GPU_ATTACHMENT_TEXTURE(txl->ms_resolve_depth),
-                                 GPU_ATTACHMENT_TEXTURE(txl->ms_resolve_color),
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE});
+                                 GPU_ATTACHMENT_TEXTURE(txl->ms_resolve_color)});
 
   lanpr_share.init_complete = 1;
 }
@@ -743,12 +724,7 @@ static void lanpr_render_to_image(LANPR_Data *vedata,
 
   GPU_framebuffer_ensure_config(&dfbl->default_fb,
                                 {GPU_ATTACHMENT_TEXTURE(dtxl->depth),
-                                 GPU_ATTACHMENT_TEXTURE(dtxl->color),
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE,
-                                 GPU_ATTACHMENT_LEAVE});
+                                 GPU_ATTACHMENT_TEXTURE(dtxl->color)});
 
   lanpr_engine_init(vedata);
   lanpr_share.dpix_reloaded_deg = 1; /*  force dpix batch to re-create */



More information about the Bf-blender-cvs mailing list