[Bf-blender-cvs] [acd8fae2d81] temp-lanpr-review: LANPR: Const qualifiers for some of the functions
YimingWu
noreply at git.blender.org
Thu Nov 28 04:39:52 CET 2019
Commit: acd8fae2d8152223941740b162f4f3f1e9a9382b
Author: YimingWu
Date: Thu Nov 28 11:39:21 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rBacd8fae2d8152223941740b162f4f3f1e9a9382b
LANPR: Const qualifiers for some of the functions
===================================================================
M source/blender/draw/engines/lanpr/lanpr_all.h
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/editors/include/ED_lanpr.h
M source/blender/editors/lanpr/lanpr_chain.c
M source/blender/editors/lanpr/lanpr_cpu.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h b/source/blender/draw/engines/lanpr/lanpr_all.h
index cf7f4837897..1c70c02335e 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -216,8 +216,8 @@ int lanpr_feed_atlas_data_obj(void *vedata,
float *AtlasFaceNormalL,
float *AtlasFaceNormalR,
float *AtlasEdgeMask,
- Object *ob,
- int begin_index);
+ const Object *ob,
+ const int begin_index);
int lanpr_feed_atlas_data_intersection_cache(void *vedata,
float *AtlasPointsL,
@@ -225,10 +225,10 @@ int lanpr_feed_atlas_data_intersection_cache(void *vedata,
float *AtlasFaceNormalL,
float *AtlasFaceNormalR,
float *AtlasEdgeMask,
- int begin_index);
+ const int begin_index);
-int lanpr_feed_atlas_trigger_preview_obj(void *vedata, Object *ob, int begin_index);
-void lanpr_create_atlas_intersection_preview(void *vedata, int begin_index);
+int lanpr_feed_atlas_trigger_preview_obj(void *vedata, const Object *ob, const int begin_index);
+void lanpr_create_atlas_intersection_preview(void *vedata, const int begin_index);
void lanpr_dpix_draw_scene(LANPR_TextureList *txl,
LANPR_FramebufferList *fbl,
@@ -238,9 +238,9 @@ void lanpr_dpix_draw_scene(LANPR_TextureList *txl,
GPUFrameBuffer *DefaultFB,
int is_render);
-void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render);
+void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, const int is_render);
-int lanpr_dpix_texture_size(SceneLANPR *lanpr);
+int lanpr_dpix_texture_size(const SceneLANPR *lanpr);
void lanpr_chain_generate_draw_command(struct LANPR_RenderBuffer *rb);
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
index 7d5490ac439..071a28eab33 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
@@ -52,9 +52,9 @@
#include <math.h>
-static float ED_lanpr_compute_chain_length_draw(LANPR_RenderLineChain *rlc,
- float *lengths,
- int begin_index)
+static float lanpr_compute_chain_length_draw(const LANPR_RenderLineChain *rlc,
+ float *lengths,
+ const int begin_index)
{
LANPR_RenderLineChainItem *rlci;
int i = 0;
@@ -74,7 +74,7 @@ static float ED_lanpr_compute_chain_length_draw(LANPR_RenderLineChain *rlc,
return offset_accum;
}
-static int lanpr_get_gpu_line_type(LANPR_RenderLineChainItem *rlci)
+static int lanpr_get_gpu_line_type(const LANPR_RenderLineChainItem *rlci)
{
switch (rlci->line_type) {
case LANPR_EDGE_FLAG_CONTOUR:
@@ -138,7 +138,7 @@ void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb)
for (rlc = rb->chains.first; rlc; rlc = rlc->next) {
- total_length = ED_lanpr_compute_chain_length_draw(rlc, lengths, i);
+ total_length = 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 b8a9e0da03c..6436cc2fcb3 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -209,7 +209,7 @@ void ED_lanpr_calculate_normal_object_vector(LANPR_LineLayer *ll, float *normal_
}
}
-void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
+void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, const int is_render)
{
LANPR_LineLayer *ll;
LANPR_PassList *psl = ((LANPR_Data *)vedata)->psl;
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index 0d7082c4118..3f6f36263af 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -58,7 +58,7 @@ extern char datatoc_lanpr_dpix_project_clip_frag_glsl[];
extern char datatoc_lanpr_dpix_preview_geom_glsl[];
extern char datatoc_lanpr_dpix_preview_frag_glsl[];
-int lanpr_dpix_texture_size(SceneLANPR *lanpr)
+int lanpr_dpix_texture_size(const SceneLANPR *lanpr)
{
switch (lanpr->gpu_cache_size) {
case LANPR_GPU_CACHE_SIZE_512:
@@ -170,8 +170,8 @@ int lanpr_feed_atlas_data_obj(void *UNUSED(vedata),
float *AtlasFaceNormalL,
float *AtlasFaceNormalR,
float *AtlasEdgeMask,
- Object *ob,
- int begin_index)
+ const Object *ob,
+ const int begin_index)
{
if (!DRW_object_is_renderable(ob)) {
return begin_index;
@@ -294,7 +294,7 @@ int lanpr_feed_atlas_data_intersection_cache(void *UNUSED(vedata),
float *AtlasFaceNormalL,
float *AtlasFaceNormalR,
float *AtlasEdgeMask,
- int begin_index)
+ const int begin_index)
{
LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared;
LinkData *lip;
@@ -346,7 +346,7 @@ int lanpr_feed_atlas_data_intersection_cache(void *UNUSED(vedata),
return begin_index + i;
}
-static void lanpr_dpix_index_to_coord(int index, float *x, float *y)
+static void lanpr_dpix_index_to_coord(const int index, float *x, float *y)
{
int texture_size = lanpr_share.texture_size;
(*x) = interpf(1, -1, (float)(index % texture_size + 0.5) / (float)texture_size);
@@ -360,7 +360,9 @@ 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 *UNUSED(vedata), Object *ob, int begin_index)
+int lanpr_feed_atlas_trigger_preview_obj(void *UNUSED(vedata),
+ const Object *ob,
+ const int begin_index)
{
Mesh *me = ob->data;
if (ob->type != OB_MESH) {
@@ -419,7 +421,7 @@ int lanpr_feed_atlas_trigger_preview_obj(void *UNUSED(vedata), Object *ob, int b
return begin_index + edge_count;
}
-void lanpr_create_atlas_intersection_preview(void *UNUSED(vedata), int begin_index)
+void lanpr_create_atlas_intersection_preview(void *UNUSED(vedata), const int begin_index)
{
LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared;
float co[2];
diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lanpr.h
index 2e9afef8bbc..e7cca043a09 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lanpr.h
@@ -536,26 +536,28 @@ int ED_lanpr_object_collection_usage_check(struct Collection *c, struct Object *
void ED_lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb);
void ED_lanpr_split_chains_for_fixed_occlusion(LANPR_RenderBuffer *rb);
-void ED_lanpr_connect_chains(LANPR_RenderBuffer *rb, int do_geometry_space);
-void ED_lanpr_discard_short_chains(LANPR_RenderBuffer *rb, float threshold);
-int ED_lanpr_count_chain(LANPR_RenderLineChain *rlc);
+void ED_lanpr_connect_chains(LANPR_RenderBuffer *rb, const int do_geometry_space);
+void ED_lanpr_discard_short_chains(LANPR_RenderBuffer *rb, const float threshold);
+int ED_lanpr_count_chain(const LANPR_RenderLineChain *rlc);
void ED_lanpr_chain_clear_picked_flag(struct LANPR_RenderBuffer *rb);
-int ED_lanpr_count_leveled_edge_segment_count(ListBase *line_list, struct LANPR_LineLayer *ll);
+int ED_lanpr_count_leveled_edge_segment_count(const ListBase *line_list,
+ const struct LANPR_LineLayer *ll);
void *ED_lanpr_make_leveled_edge_vertex_array(struct LANPR_RenderBuffer *rb,
- ListBase *line_list,
+ const ListBase *line_list,
float *vertex_array,
float *normal_array,
float **next_normal,
- LANPR_LineLayer *ll,
- float componet_id);
+ const LANPR_LineLayer *ll,
+ const float componet_id);
void ED_lanpr_calculation_set_flag(LANPR_RenderStatus flag);
bool ED_lanpr_calculation_flag_check(LANPR_RenderStatus flag);
-int ED_lanpr_compute_feature_lines_internal(struct Depsgraph *depsgraph, int instersections_only);
+int ED_lanpr_compute_feature_lines_internal(struct Depsgraph *depsgraph,
+ const int instersections_only);
-void ED_lanpr_compute_feature_lines_background(struct Depsgraph *dg, int intersection_only);
+void ED_lanpr_compute_feature_lines_background(struct Depsgraph *dg, const int intersection_only);
LANPR_RenderBuffer *ED_lanpr_create_render_buffer(void);
void ED_lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
diff --git a/source/blender/editors/lanpr/lanpr_chain.c b/source/blender/editors/lanpr/lanpr_chain.c
index 19db3c6228f..16e2743922a 100644
--- a/source/blender/editors/lanpr/lanpr_chain.c
+++ b/source/blender/editors/lanpr/lanpr_chain.c
@@ -583,7 +583,7 @@ static void lanpr_connect_two_chains(LANPR_RenderBuffer *UNUSED(rb),
/* this only does head-tail connection.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list