[Bf-blender-cvs] [a48583ffee9] temp-lanpr-cleanup2: LANPR: Consistent naming in shader variables.

YimingWu noreply at git.blender.org
Wed Oct 30 09:40:07 CET 2019


Commit: a48583ffee991e9cecbcbcbcba971ebb179c1b65
Author: YimingWu
Date:   Wed Oct 30 15:24:41 2019 +0800
Branches: temp-lanpr-cleanup2
https://developer.blender.org/rBa48583ffee991e9cecbcbcbcba971ebb179c1b65

LANPR: Consistent naming in shader variables.

eg: Use color_xxx normal_xxx thickness_xxx consistently for easy formatting.

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

M	source/blender/draw/engines/lanpr/lanpr_cpu.c
M	source/blender/draw/engines/lanpr/lanpr_engine.c
M	source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl
M	source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl
M	source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl
M	source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl
M	source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 1dc8153eb8c..6c5db708ca6 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -294,29 +294,29 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
         DRW_shgroup_uniform_float(rb->ChainShgrp, "camzoom", &camzoom, 1);
 
         DRW_shgroup_uniform_vec4(rb->ChainShgrp,
-                                 "contour_color",
+                                 "color_contour",
                                  (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color :
                                                                                  ll->contour.color,
                                  1);
         DRW_shgroup_uniform_vec4(rb->ChainShgrp,
-                                 "crease_color",
+                                 "color_crease",
                                  (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color :
                                                                                  ll->crease.color,
                                  1);
         DRW_shgroup_uniform_vec4(rb->ChainShgrp,
-                                 "material_color",
+                                 "color_material",
                                  (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ?
                                      ll->color :
                                      ll->material_separate.color,
                                  1);
         DRW_shgroup_uniform_vec4(
             rb->ChainShgrp,
-            "edge_mark_color",
+            "color_edge_mark",
             (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color : ll->edge_mark.color,
             1);
         DRW_shgroup_uniform_vec4(
             rb->ChainShgrp,
-            "intersection_color",
+            "color_intersection",
             (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color : ll->intersection.color,
             1);
         static float unit_thickness = 1.0f;
@@ -420,28 +420,28 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
 
           DRW_shgroup_uniform_vec4(
               ll->shgrp,
-              "contour_color",
+              "color_contour",
               (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color : ll->contour.color,
               1);
           DRW_shgroup_uniform_vec4(
               ll->shgrp,
-              "crease_color",
+              "color_crease",
               (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color : ll->crease.color,
               1);
           DRW_shgroup_uniform_vec4(ll->shgrp,
-                                   "material_color",
+                                   "color_material",
                                    (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ?
                                        ll->color :
                                        ll->material_separate.color,
                                    1);
           DRW_shgroup_uniform_vec4(
               ll->shgrp,
-              "edge_mark_color",
+              "color_edge_mark",
               (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color : ll->edge_mark.color,
               1);
           DRW_shgroup_uniform_vec4(
               ll->shgrp,
-              "intersection_color",
+              "color_intersection",
               (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color : ll->intersection.color,
               1);
           static float uniform_thickness = 1.0f;
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index c8aa35165d9..120eecc5755 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -290,15 +290,15 @@ static void lanpr_cache_init(void *vedata)
     stl->g_data->dpix_transform_shgrp = DRW_shgroup_create(lanpr_share.dpix_transform_shader,
                                                            psl->dpix_transform_pass);
     DRW_shgroup_uniform_texture_ref(
-        stl->g_data->dpix_transform_shgrp, "vert0_tex", &txl->dpix_in_pl);
+        stl->g_data->dpix_transform_shgrp, "tex_vert0", &txl->dpix_in_pl);
     DRW_shgroup_uniform_texture_ref(
-        stl->g_data->dpix_transform_shgrp, "vert1_tex", &txl->dpix_in_pr);
+        stl->g_data->dpix_transform_shgrp, "tex_vert1", &txl->dpix_in_pr);
     DRW_shgroup_uniform_texture_ref(
-        stl->g_data->dpix_transform_shgrp, "face_normal0_tex", &txl->dpix_in_nl);
+        stl->g_data->dpix_transform_shgrp, "tex_fnormal0", &txl->dpix_in_nl);
     DRW_shgroup_uniform_texture_ref(
-        stl->g_data->dpix_transform_shgrp, "face_normal1_tex", &txl->dpix_in_nr);
+        stl->g_data->dpix_transform_shgrp, "tex_fnormal1", &txl->dpix_in_nr);
     DRW_shgroup_uniform_texture_ref(
-        stl->g_data->dpix_transform_shgrp, "edge_mask_tex", &txl->dpix_in_edge_mask);
+        stl->g_data->dpix_transform_shgrp, "tex_edge_mask", &txl->dpix_in_edge_mask);
     DRW_shgroup_uniform_int(
         stl->g_data->dpix_transform_shgrp, "sample_step", &stl->g_data->dpix_sample_step, 1);
     DRW_shgroup_uniform_int(
@@ -328,41 +328,41 @@ static void lanpr_cache_init(void *vedata)
     stl->g_data->dpix_preview_shgrp = DRW_shgroup_create(lanpr_share.dpix_preview_shader,
                                                          psl->dpix_preview_pass);
     DRW_shgroup_uniform_texture_ref(
-        stl->g_data->dpix_preview_shgrp, "vert0_tex", &txl->dpix_out_pl);
+        stl->g_data->dpix_preview_shgrp, "tex_vert0", &txl->dpix_out_pl);
     DRW_shgroup_uniform_texture_ref(
-        stl->g_data->dpix_preview_shgrp, "vert1_tex", &txl->dpix_out_pr);
+        stl->g_data->dpix_preview_shgrp, "tex_vert1", &txl->dpix_out_pr);
     DRW_shgroup_uniform_texture_ref(
-        stl->g_data->dpix_preview_shgrp, "face_normal0_tex", &txl->dpix_in_nl);
+        stl->g_data->dpix_preview_shgrp, "tex_fnormal0", &txl->dpix_in_nl);
     DRW_shgroup_uniform_texture_ref(stl->g_data->dpix_preview_shgrp,
-                                    "face_normal1_tex",
+                                    "tex_fnormal1",
                                     &txl->dpix_in_nr); /*  these are for normal shading */
     DRW_shgroup_uniform_texture_ref(
-        stl->g_data->dpix_preview_shgrp, "edge_mask_tex", &txl->dpix_in_edge_mask);
+        stl->g_data->dpix_preview_shgrp, "tex_edge_mask", &txl->dpix_in_edge_mask);
     DRW_shgroup_uniform_vec4(
         stl->g_data->dpix_preview_shgrp, "viewport", stl->g_data->dpix_viewport, 1);
     DRW_shgroup_uniform_vec4(stl->g_data->dpix_preview_shgrp,
-                             "contour_color",
+                             "color_contour",
                              (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color :
                                                                              ll->contour.color,
                              1);
     DRW_shgroup_uniform_vec4(stl->g_data->dpix_preview_shgrp,
-                             "crease_color",
+                             "color_crease",
                              (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color :
                                                                              ll->crease.color,
                              1);
     DRW_shgroup_uniform_vec4(
         stl->g_data->dpix_preview_shgrp,
-        "material_color",
+        "color_material",
         (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color : ll->material_separate.color,
         1);
     DRW_shgroup_uniform_vec4(stl->g_data->dpix_preview_shgrp,
-                             "edge_mark_color",
+                             "color_edge_mark",
                              (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color :
                                                                              ll->edge_mark.color,
                              1);
     DRW_shgroup_uniform_vec4(
         stl->g_data->dpix_preview_shgrp,
-        "intersection_color",
+        "color_intersection",
         (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? ll->color : ll->intersection.color,
         1);
     static float use_background_color[4];
@@ -391,27 +391,27 @@ static void lanpr_cache_init(void *vedata)
         stl->g_data->dpix_preview_shgrp, "line_thickness", &ll->thickness, 1);
     DRW_shgroup_uniform_float(
         stl->g_data->dpix_preview_shgrp,
-        "line_thickness_contour",
+        "thickness_contour",
         (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? &unit_thickness : &ll->contour.thickness,
         1);
     DRW_shgroup_uniform_float(
         stl->g_data->dpix_preview_shgrp,
-        "line_thickness_crease",
+        "thickness_crease",
         (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? &unit_thickness : &ll->crease.thickness,
         1);
     DRW_shgroup_uniform_float(stl->g_data->dpix_preview_shgrp,
-                              "line_thickness_material",
+                              "thickness_material",
                               (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ?
                                   &unit_thickness :
                                   &ll->material_separate.thickness,
                               1);
     DRW_shgroup_uniform_float(
         stl->g_data->dpix_preview_shgrp,
-        "line_thickness_edge_mark",
+        "thickness_edge_mark",
         (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ? &unit_thickness : &ll->edge_mark.thickness,
         1);
     DRW_shgroup_uniform_float(stl->g_data->dpix_preview_shgrp,
-                              "line_thickness_intersection",
+                              "thickness_intersection",
                               (ll->flags & LANPR_LINE_LAYER_USE_SAME_STYLE) ?
                                   &unit_thickness :
                                   &ll->intersection.thickness,
diff --git a/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl b/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl
index 87bcf1698b9

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list