[Bf-blender-cvs] [b07a0fe41d4] soc-2019-npr: LANPR: Use GPU_BATCH_DISCARD_SAFE marco.
YimingWu
noreply at git.blender.org
Fri Jul 19 11:05:38 CEST 2019
Commit: b07a0fe41d447b27ddd9b0c22db9e250528ae1aa
Author: YimingWu
Date: Fri Jul 19 17:05:13 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBb07a0fe41d447b27ddd9b0c22db9e250528ae1aa
LANPR: Use GPU_BATCH_DISCARD_SAFE marco.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_dpix.c
M source/blender/draw/engines/lanpr/lanpr_engine.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 d11778a8115..f1b85b389ad 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -416,7 +416,7 @@ void lanpr_create_atlas_intersection_preview(void *vedata, int begin_index)
}
if (rb->DPIXIntersectionBatch) {
- GPU_batch_discard(rb->DPIXIntersectionBatch);
+ GPU_BATCH_DISCARD_SAFE(rb->DPIXIntersectionBatch);
}
rb->DPIXIntersectionBatch = 0;
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index cb369e63198..f5f0c298ee0 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -400,17 +400,17 @@ static void lanpr_cache_init(void *vedata)
LANPR_BatchItem *dpbi;
while (dpbi = BLI_pophead(&lanpr_share.dpix_batch_list)) {
- GPU_batch_discard(dpbi->dpix_preview_batch);
- GPU_batch_discard(dpbi->dpix_transform_batch);
+ GPU_BATCH_DISCARD_SAFE(dpbi->dpix_preview_batch);
+ GPU_BATCH_DISCARD_SAFE(dpbi->dpix_transform_batch);
}
LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared;
if (rb) {
if (rb->DPIXIntersectionBatch) {
- GPU_batch_discard(rb->DPIXIntersectionBatch);
+ GPU_BATCH_DISCARD_SAFE(rb->DPIXIntersectionBatch);
rb->DPIXIntersectionBatch = 0;
}
if (rb->DPIXIntersectionTransformBatch) {
- GPU_batch_discard(rb->DPIXIntersectionTransformBatch);
+ GPU_BATCH_DISCARD_SAFE(rb->DPIXIntersectionTransformBatch);
rb->DPIXIntersectionTransformBatch = 0;
}
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_snake.c b/source/blender/draw/engines/lanpr/lanpr_snake.c
index a0f63919e84..ab702f5e053 100644
--- a/source/blender/draw/engines/lanpr/lanpr_snake.c
+++ b/source/blender/draw/engines/lanpr/lanpr_snake.c
@@ -579,7 +579,7 @@ void lanpr_snake_draw_scene(LANPR_TextureList *txl,
GPU_framebuffer_bind(fbl->edge_intermediate);
DRW_draw_pass(psl->snake_pass);
- GPU_batch_discard(snake_batch);
+ GPU_BATCH_DISCARD_SAFE(snake_batch);
BLI_mempool_clear(lanpr_share.mp_sample);
BLI_mempool_clear(lanpr_share.mp_line_strip);
More information about the Bf-blender-cvs
mailing list