[Bf-blender-cvs] [214978376e6] soc-2019-npr: Cleanup: Fixed many warnings.

YimingWu noreply at git.blender.org
Thu Aug 1 10:08:44 CEST 2019


Commit: 214978376e6d08b03c0f220aa03d4435a41c46e1
Author: YimingWu
Date:   Thu Aug 1 16:08:26 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB214978376e6d08b03c0f220aa03d4435a41c46e1

Cleanup: Fixed many warnings.

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

M	source/blender/draw/engines/lanpr/lanpr_chain_draw.c
M	source/blender/draw/engines/lanpr/lanpr_cpu.c
M	source/blender/draw/engines/lanpr/lanpr_dpix.c
M	source/blender/draw/engines/lanpr/lanpr_engine.c
M	source/blender/draw/modes/object_mode.c
M	source/blender/editors/include/ED_lanpr.h
M	source/blender/editors/lanpr/lanpr_chain.c
M	source/blender/editors/lanpr/lanpr_cpu.c
M	source/blender/editors/lanpr/lanpr_ops.c
M	source/blender/editors/lanpr/lanpr_util.c
M	source/blender/editors/render/render_intern.h
M	source/blender/editors/render/render_ops.c

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
index 370ff9cfdda..e0f6876a790 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
@@ -26,7 +26,7 @@
 
 #include <math.h>
 
-static float lanpr_compute_chain_length_draw(LANPR_RenderLineChain *rlc, float *lengths, int begin_index)
+static float ED_lanpr_compute_chain_length_draw(LANPR_RenderLineChain *rlc, float *lengths, int begin_index)
 {
   LANPR_RenderLineChainItem *rlci;
   int i = 0;
@@ -104,7 +104,7 @@ void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb)
 
   for (rlc = rb->chains.first; rlc; rlc = rlc->next) {
 
-    total_length = lanpr_compute_chain_length_draw(rlc, lengths, i);
+    total_length = ED_lanpr_compute_chain_length_draw(rlc, lengths, i);
 
     for (rlci = rlc->chain.first; rlci; rlci = rlci->next) {
 
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index b8bb78c9713..4e2b57fa831 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -138,7 +138,7 @@ static void lanpr_rebuild_render_draw_command(LANPR_RenderBuffer *rb, LANPR_Line
   /*  later implement .... */
   /* } */
 }
-void lanpr_rebuild_all_command(SceneLANPR *lanpr)
+void ED_lanpr_rebuild_all_command(SceneLANPR *lanpr)
 {
   LANPR_LineLayer *ll;
   if (!lanpr || !lanpr_share.render_buffer_shared) {
@@ -160,59 +160,7 @@ void lanpr_rebuild_all_command(SceneLANPR *lanpr)
   DEG_id_tag_update(&lanpr_share.render_buffer_shared->scene->id, ID_RECALC_COPY_ON_WRITE);
 }
 
-void lanpr_viewport_draw_offline_result(LANPR_TextureList *txl,
-                                        LANPR_FramebufferList *fbl,
-                                        LANPR_PassList *psl,
-                                        LANPR_PrivateData *pd,
-                                        SceneLANPR *lanpr)
-{
-  float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f};
-  float clear_depth = 1.0f;
-  uint clear_stencil = 0xFF;
-  float use_background_color[4] = {0.0f, 0.0f, 0.0f, 1.0f};
-
-  DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
-  DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
-
-  int texw = GPU_texture_width(dtxl->color), texh = GPU_texture_height(dtxl->color);
-  int tsize = texw * texh;
-
-  const DRWContextState *draw_ctx = DRW_context_state_get();
-  Scene *scene = DEG_get_evaluated_scene(draw_ctx->depsgraph);
-  View3D *v3d = draw_ctx->v3d;
-  Object *camera;
-  if (v3d) {
-    RegionView3D *rv3d = draw_ctx->rv3d;
-    camera = (rv3d->persp == RV3D_CAMOB) ? v3d->camera : NULL;
-  }
-  else {
-    camera = scene->camera;
-  }
-
-  if (lanpr->use_world_background) {
-    copy_v3_v3(use_background_color, &scene->world->horr);
-    use_background_color[3] = 1;
-  }
-  else {
-    copy_v4_v4(use_background_color, lanpr->background_color);
-  }
-
-  GPU_framebuffer_bind(fbl->dpix_transform);
-  DRW_draw_pass(psl->dpix_transform_pass);
-
-  GPU_framebuffer_bind(fbl->dpix_preview);
-  eGPUFrameBufferBits clear_bits = GPU_COLOR_BIT;
-  GPU_framebuffer_clear(
-      fbl->dpix_preview, clear_bits, use_background_color, clear_depth, clear_stencil);
-  DRW_draw_pass(psl->dpix_preview_pass);
-
-  GPU_framebuffer_bind(dfbl->default_fb);
-  GPU_framebuffer_clear(
-      dfbl->default_fb, clear_bits, use_background_color, clear_depth, clear_stencil);
-  DRW_multisamples_resolve(txl->depth, txl->color, 1);
-}
-
-void lanpr_calculate_normal_object_vector(LANPR_LineLayer *ll, float *normal_object_direction)
+void ED_lanpr_calculate_normal_object_vector(LANPR_LineLayer *ll, float *normal_object_direction)
 {
   Object *ob;
   switch (ll->normal_mode) {
@@ -265,10 +213,9 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
   static float camdx, camdy, camzoom;
 
   if (is_render) {
-    lanpr_rebuild_all_command(lanpr);
+    ED_lanpr_rebuild_all_command(lanpr);
   }
 
-  float clear_col[4] = {1.0f, 0.0f, 0.0f, 1.0f};
   float clear_depth = 1.0f;
   uint clear_stencil = 0xFF;
   eGPUFrameBufferBits clear_bits = GPU_DEPTH_BIT | GPU_COLOR_BIT;
@@ -326,7 +273,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
         rb->ChainShgrp = DRW_shgroup_create(lanpr_share.software_chaining_shader,
                                             psl->software_pass);
 
-        lanpr_calculate_normal_object_vector(ll, normal_object_direction);
+        ED_lanpr_calculate_normal_object_vector(ll, normal_object_direction);
 
         DRW_shgroup_uniform_float(rb->ChainShgrp, "camdx", &camdx, 1);
         DRW_shgroup_uniform_float(rb->ChainShgrp, "camdy", &camdy, 1);
@@ -429,7 +376,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
                                                    DRW_STATE_DEPTH_LESS_EQUAL);
           ll->shgrp = DRW_shgroup_create(lanpr_share.software_shader, psl->software_pass);
 
-          lanpr_calculate_normal_object_vector(ll, normal_object_direction);
+          ED_lanpr_calculate_normal_object_vector(ll, normal_object_direction);
 
           DRW_shgroup_uniform_float(ll->shgrp, "camdx", &camdx, 1);
           DRW_shgroup_uniform_float(ll->shgrp, "camdy", &camdy, 1);
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index b5f16f6a7a7..737c05be3d4 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -257,7 +257,7 @@ int lanpr_feed_atlas_data_obj(void *UNUSED(vedata),
   return begin_index + edge_count;
 }
 
-int lanpr_feed_atlas_data_intersection_cache(void *vedata,
+int lanpr_feed_atlas_data_intersection_cache(void *UNUSED(vedata),
                                              float *AtlasPointsL,
                                              float *AtlasPointsR,
                                              float *AtlasFaceNormalL,
@@ -329,7 +329,7 @@ static void lanpr_dpix_index_to_coord_absolute(int index, float *x, float *y)
   (*y) = (float)(index / texture_size) + 0.5;
 }
 
-int lanpr_feed_atlas_trigger_preview_obj(void *vedata, Object *ob, int begin_index)
+int lanpr_feed_atlas_trigger_preview_obj(void *UNUSED(vedata), Object *ob, int begin_index)
 {
   Mesh *me = ob->data;
   if (ob->type != OB_MESH) {
@@ -388,7 +388,7 @@ int lanpr_feed_atlas_trigger_preview_obj(void *vedata, Object *ob, int begin_ind
   return begin_index + edge_count;
 }
 
-void lanpr_create_atlas_intersection_preview(void *vedata, int begin_index)
+void lanpr_create_atlas_intersection_preview(void *UNUSED(vedata), int begin_index)
 {
   LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared;
   float co[2];
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 9a105bd7023..c4ce65f87c2 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -46,23 +46,12 @@ extern char datatoc_gpu_shader_2D_smooth_color_frag_glsl[];
 
 LANPR_SharedResource lanpr_share;
 
-void lanpr_calculate_normal_object_vector(LANPR_LineLayer *ll, float *normal_object_direction);
-
-void lanpr_rebuild_all_command(SceneLANPR *lanpr);
-
 static void lanpr_engine_init(void *ved)
 {
   lanpr_share.ved_viewport = ved;
   LANPR_Data *vedata = (LANPR_Data *)ved;
   LANPR_TextureList *txl = vedata->txl;
   LANPR_FramebufferList *fbl = vedata->fbl;
-  LANPR_StorageList *stl = ((LANPR_Data *)vedata)->stl;
-  DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
-
-  const DRWContextState *draw_ctx = DRW_context_state_get();
-  Scene *scene = DEG_get_evaluated_scene(draw_ctx->depsgraph);
-  SceneLANPR *lanpr = &scene->lanpr;
-  View3D *v3d = draw_ctx->v3d;
 
   if (!lanpr_share.init_complete) {
     BLI_spin_init(&lanpr_share.render_flag_lock);
@@ -143,8 +132,6 @@ static void lanpr_engine_init(void *ved)
 
 static void lanpr_engine_free(void)
 {
-  void *ved = lanpr_share.ved_viewport;
-
   DRW_SHADER_FREE_SAFE(lanpr_share.multichannel_shader);
   DRW_SHADER_FREE_SAFE(lanpr_share.snake_connection_shader);
   DRW_SHADER_FREE_SAFE(lanpr_share.software_chaining_shader);
@@ -197,7 +184,6 @@ static void lanpr_cache_init(void *vedata)
   const DRWContextState *draw_ctx = DRW_context_state_get();
   Scene *scene = DEG_get_evaluated_scene(draw_ctx->depsgraph);
   SceneLANPR *lanpr = &scene->lanpr;
-  View3D *v3d = draw_ctx->v3d;
 
   int texture_size = lanpr_dpix_texture_size(lanpr);
   lanpr_share.texture_size = texture_size;
@@ -372,7 +358,7 @@ static void lanpr_cache_init(void *vedata)
     DRW_shgroup_uniform_float(
         stl->g_data->dpix_preview_shgrp, "z_far", &stl->g_data->dpix_zfar, 1);
 
-    lanpr_calculate_normal_object_vector(ll, normal_object_direction);
+    ED_lanpr_calculate_normal_object_vector(ll, normal_object_direction);
 
     DRW_shgroup_uniform_int(stl->g_data->dpix_preview_shgrp, "normal_mode", &ll->normal_mode, 1);
     DRW_shgroup_uniform_int(
@@ -399,7 +385,7 @@ static void lanpr_cache_init(void *vedata)
       pd->atlas_edge_mask = MEM_callocN(fsize, "atlas_edge_mask"); /*  should always be float */
 
       LANPR_BatchItem *dpbi;
-      while (dpbi = BLI_pophead(&lanpr_share.dpix_batch_list)) {
+      while ((dpbi = BLI_pophead(&lanpr_share.dpix_batch_list))!=NULL) {
         GPU_BATCH_DISCARD_SAFE(dpbi->dpix_preview_batch);
         GPU_BATCH_DISCARD_SAFE(dpbi->dpix_transform_batch);
       }
@@ -437,7 +423,7 @@ static void lanpr_cache_init(void *vedata)
   }
 
   if (updated) {
-    lanpr_rebuild_all_command(&draw_ctx->scene->lanpr);
+    ED_lanpr_rebuild_all_command(&draw_ctx->scene->lanpr);
   }
 }
 
@@ -446,10 +432,9 @@ static void lanpr_cache_populate(void *vedata, Object *ob)
 
   LANPR_StorageList *stl = ((LANPR_Data *)vedata)->stl;
   LANPR_PrivateData *pd = stl->g_data;
-  const DRWContextState *draw_ctx = DRW_context_state_get();
-  View3D *v3d = draw_ctx->v3d;
+  const DRWContextState *draw_ctx = DRW_context_state_get();\
   SceneLANPR *lanpr = &draw_ctx->scene->lanpr;
-  int usage, dpix_ok;
+  int usage = OBJECT_FEATURE

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list