[Bf-blender-cvs] [97d22e12b52] master: Cleanup: DRW: Remove uneeded DRWState values

Clément Foucault noreply at git.blender.org
Fri May 17 18:17:28 CEST 2019


Commit: 97d22e12b521a04e1d8809704bfeae8d526b24a8
Author: Clément Foucault
Date:   Fri May 17 14:04:30 2019 +0200
Branches: master
https://developer.blender.org/rB97d22e12b521a04e1d8809704bfeae8d526b24a8

Cleanup: DRW: Remove uneeded DRWState values

This removes:
- DRW_STATE_TRANS_FEEDBACK
- DRW_STATE_WIRE
- DRW_STATE_POINT

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

M	source/blender/draw/engines/basic/basic_engine.c
M	source/blender/draw/engines/eevee/eevee_materials.c
M	source/blender/draw/engines/eevee/eevee_subsurface.c
M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_anim_viz.c
M	source/blender/draw/intern/draw_common.c
M	source/blender/draw/intern/draw_hair.c
M	source/blender/draw/intern/draw_manager.c
M	source/blender/draw/intern/draw_manager_exec.c
M	source/blender/draw/modes/edit_armature_mode.c
M	source/blender/draw/modes/edit_curve_mode.c
M	source/blender/draw/modes/edit_lattice_mode.c
M	source/blender/draw/modes/edit_mesh_mode.c
M	source/blender/draw/modes/edit_metaball_mode.c
M	source/blender/draw/modes/edit_text_mode.c
M	source/blender/draw/modes/object_mode.c
M	source/blender/draw/modes/particle_mode.c
M	source/blender/draw/modes/pose_mode.c

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

diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c
index 360d1d30736..aad92c9658a 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -106,8 +106,8 @@ static void basic_cache_init(void *vedata)
   }
 
   {
-    psl->depth_pass = DRW_pass_create(
-        "Depth Pass", DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_WIRE);
+    psl->depth_pass = DRW_pass_create("Depth Pass",
+                                      DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL);
     stl->g_data->depth_shgrp = DRW_shgroup_create(sh_data->depth, psl->depth_pass);
     if (draw_ctx->sh_cfg == GPU_SHADER_CFG_CLIPPED) {
       DRW_shgroup_world_clip_planes_from_rv3d(stl->g_data->depth_shgrp, rv3d);
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 7989d4d7ec2..5a54d7a4615 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -923,8 +923,7 @@ static struct DRWShadingGroup *EEVEE_default_shading_group_get(EEVEE_ViewLayerDa
   }
 
   if (vedata->psl->default_pass[options] == NULL) {
-    DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_CLIP_PLANES |
-                     DRW_STATE_WIRE;
+    DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_CLIP_PLANES;
     vedata->psl->default_pass[options] = DRW_pass_create("Default Lit Pass", state);
 
     /* XXX / WATCH: This creates non persistent binds for the ubos and textures.
@@ -1017,7 +1016,7 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
   }
 
   {
-    DRWState state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_WIRE;
+    DRWState state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL;
     psl->depth_pass = DRW_pass_create("Depth Pass", state);
     stl->g_data->depth_shgrp = DRW_shgroup_create(e_data.default_prepass_sh, psl->depth_pass);
 
@@ -1026,8 +1025,7 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     stl->g_data->depth_shgrp_cull = DRW_shgroup_create(e_data.default_prepass_sh,
                                                        psl->depth_pass_cull);
 
-    state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_CLIP_PLANES |
-            DRW_STATE_WIRE;
+    state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_CLIP_PLANES;
     psl->depth_pass_clip = DRW_pass_create("Depth Pass Clip", state);
     stl->g_data->depth_shgrp_clip = DRW_shgroup_create(e_data.default_prepass_clip_sh,
                                                        psl->depth_pass_clip);
@@ -1042,14 +1040,13 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
   }
 
   {
-    DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_CLIP_PLANES |
-                     DRW_STATE_WIRE;
+    DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_CLIP_PLANES;
     psl->material_pass = DRW_pass_create("Material Pass", state);
     psl->material_pass_cull = DRW_pass_create("Material Pass Cull", state | DRW_STATE_CULL_BACK);
   }
 
   {
-    DRWState state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_WIRE;
+    DRWState state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL;
     psl->refract_depth_pass = DRW_pass_create("Refract Depth Pass", state);
     stl->g_data->refract_depth_shgrp = DRW_shgroup_create(e_data.default_prepass_sh,
                                                           psl->refract_depth_pass);
@@ -1059,8 +1056,7 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     stl->g_data->refract_depth_shgrp_cull = DRW_shgroup_create(e_data.default_prepass_sh,
                                                                psl->refract_depth_pass_cull);
 
-    state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_CLIP_PLANES |
-            DRW_STATE_WIRE;
+    state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_CLIP_PLANES;
     psl->refract_depth_pass_clip = DRW_pass_create("Refract Depth Pass Clip", state);
     stl->g_data->refract_depth_shgrp_clip = DRW_shgroup_create(e_data.default_prepass_clip_sh,
                                                                psl->refract_depth_pass_clip);
@@ -1077,22 +1073,20 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
   }
 
   {
-    DRWState state = (DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_CLIP_PLANES |
-                      DRW_STATE_WIRE);
+    DRWState state = (DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_CLIP_PLANES);
     psl->refract_pass = DRW_pass_create("Opaque Refraction Pass", state);
   }
 
   {
     DRWState state = (DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_CLIP_PLANES |
-                      DRW_STATE_WIRE | DRW_STATE_WRITE_STENCIL);
+                      DRW_STATE_WRITE_STENCIL);
     psl->sss_pass = DRW_pass_create("Subsurface Pass", state);
     psl->sss_pass_cull = DRW_pass_create("Subsurface Pass Cull", state | DRW_STATE_CULL_BACK);
     e_data.sss_count = 0;
   }
 
   {
-    DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_CLIP_PLANES |
-                     DRW_STATE_WIRE;
+    DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_CLIP_PLANES;
     psl->transparent_pass = DRW_pass_create("Material Transparent Pass", state);
   }
 
diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c
index c73ee0718b1..2323fdfc31c 100644
--- a/source/blender/draw/engines/eevee/eevee_subsurface.c
+++ b/source/blender/draw/engines/eevee/eevee_subsurface.c
@@ -174,7 +174,7 @@ void EEVEE_subsurface_output_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Dat
 
     /* Make the opaque refraction pass mask the sss. */
     DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_CLIP_PLANES |
-                     DRW_STATE_WIRE | DRW_STATE_WRITE_STENCIL;
+                     DRW_STATE_WRITE_STENCIL;
     DRW_pass_state_set(vedata->psl->refract_pass, state);
     DRW_pass_foreach_shgroup(vedata->psl->refract_pass, &set_shgrp_stencil, NULL);
   }
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index cf7e9521053..6d290f9a2d3 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -313,43 +313,47 @@ void DRW_shader_free(struct GPUShader *shader);
 /* Batches */
 
 typedef enum {
+  /** Wrtie mask */
   DRW_STATE_WRITE_DEPTH = (1 << 0),
   DRW_STATE_WRITE_COLOR = (1 << 1),
-  DRW_STATE_DEPTH_ALWAYS = (1 << 2),
-  DRW_STATE_DEPTH_LESS = (1 << 3),
-  DRW_STATE_DEPTH_LESS_EQUAL = (1 << 4),
-  DRW_STATE_DEPTH_EQUAL = (1 << 5),
-  DRW_STATE_DEPTH_GREATER = (1 << 6),
-  DRW_STATE_DEPTH_GREATER_EQUAL = (1 << 7),
-  DRW_STATE_CULL_BACK = (1 << 8),
-  DRW_STATE_CULL_FRONT = (1 << 9),
-  DRW_STATE_WIRE = (1 << 10),  /* TODO remove */
-  DRW_STATE_POINT = (1 << 11), /* TODO remove */
+  DRW_STATE_WRITE_STENCIL = (1 << 2),
+  DRW_STATE_WRITE_STENCIL_SHADOW_PASS = (1 << 3),
+  DRW_STATE_WRITE_STENCIL_SHADOW_FAIL = (1 << 4),
+
+  /** Depth test */
+  DRW_STATE_DEPTH_ALWAYS = (1 << 5),
+  DRW_STATE_DEPTH_LESS = (1 << 6),
+  DRW_STATE_DEPTH_LESS_EQUAL = (1 << 7),
+  DRW_STATE_DEPTH_EQUAL = (1 << 8),
+  DRW_STATE_DEPTH_GREATER = (1 << 9),
+  DRW_STATE_DEPTH_GREATER_EQUAL = (1 << 10),
+  /** Culling test */
+  DRW_STATE_CULL_BACK = (1 << 11),
+  DRW_STATE_CULL_FRONT = (1 << 12),
+  /** Stencil test */
+  DRW_STATE_STENCIL_EQUAL = (1 << 13),
+  DRW_STATE_STENCIL_NEQUAL = (1 << 14),
+
+  /** Blend state */
+  DRW_STATE_ADDITIVE = (1 << 15),
+  /** Same as additive but let alpha accumulate without premult. */
+  DRW_STATE_ADDITIVE_FULL = (1 << 16),
+  DRW_STATE_BLEND = (1 << 17),
+  /** Use that if color is already premult by alpha. */
+  DRW_STATE_BLEND_PREMUL = (1 << 18),
+  DRW_STATE_BLEND_PREMUL_UNDER = (1 << 19),
+  DRW_STATE_BLEND_OIT = (1 << 20),
+  DRW_STATE_MULTIPLY = (1 << 21),
+
+  DRW_STATE_CLIP_PLANES = (1 << 22),
+  DRW_STATE_WIRE_SMOOTH = (1 << 23),
+  DRW_STATE_FIRST_VERTEX_CONVENTION = (1 << 24),
   /** Polygon offset. Does not work with lines and points. */
-  DRW_STATE_OFFSET_POSITIVE = (1 << 12),
+  DRW_STATE_OFFSET_POSITIVE = (1 << 25),
   /** Polygon offset. Does not work with lines and points. */
-  DRW_STATE_OFFSET_NEGATIVE = (1 << 13),
-  DRW_STATE_WIRE_WIDE = (1 << 14),
-  DRW_STATE_BLEND = (1 << 15),
-  DRW_STATE_ADDITIVE = (1 << 16),
-  DRW_STATE_MULTIPLY = (1 << 17),
-  DRW_STATE_BLEND_PREMUL_UNDER = (1 << 18),
-  DRW_STATE_CLIP_PLANES = (1 << 19),
-  /** Same as DRW_STATE_ADDITIVE but let alpha accumulate without premult. */
-  DRW_STATE_ADDITIVE_FULL = (1 << 20),
-  /** Use that if color is already premult by alpha. */
-  DRW_STATE_BLEND_PREMUL = (1 << 21),
-  DRW_STATE_WIRE_SMOOTH = (1 << 22),
-  DRW_STATE_TRANS_FEEDBACK = (1 << 23),
-  DRW_STATE_BLEND_OIT = (1 << 24),
-  DRW_STATE_FIRST_VERTEX_CONVENTION = (1 << 25),
-
-  DRW_STATE_WRITE_STENCIL = (1 << 27),
-  DRW_STATE_WRITE_STENCIL_SHADOW_PASS = (1 << 28),
-  DRW_STATE_WRITE_STENCIL_SHADOW_FAIL = (1 << 29),
-  DRW_STATE_STENCIL_EQUAL = (1 << 30),
-  DRW_STATE_STENCIL_NEQUAL = (1 << 31),
+  DRW_STATE_OFFSET_NEGATIVE = (1 << 26),
 } DRWState;
+
 #define DRW_STATE_DEFAULT \
   (DRW_STATE_WRITE_DEPTH | DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_LESS_EQUAL)
 #define DRW_STATE_RASTERIZER_ENABLED \
diff --git a/source/blender/draw/intern/draw_anim_viz.c b/source/blender/draw/intern/draw_anim_viz.c
index 31d7a45ede9..72459309133 100644
--- a/source/blender/draw/intern/draw_anim_viz.c
+++ b/source/blender/draw/intern/draw_anim_viz.c
@@ -139,7 +139,7 @@ static void MPATH_cache_init(void *vedata)
   }
 
   {
-    DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_POINT;
+    DRWState state = DRW_STATE_WRITE_COLOR;
     psl->points = DRW_pass_create("Motionpath Point Pass", state);
   }
 }
dif

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list