diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 15:15:52 +0300 |
commit | 9516921c05bd9fee5c94942eb8e38f47ba7e4351 (patch) | |
tree | da007fc17bc6a02f849dae2e8f76f5ab304fe4dc /source/blender/draw/CMakeLists.txt | |
parent | 1f6c3699a836d485ed37f443cd0fcd19e978dbb6 (diff) |
Overlay Engine: Refactor & Cleanup
This is the unification of all overlays into one overlay engine as described in T65347.
I went over all the code making it more future proof with less hacks and removing old / not relevent parts.
Goals / Acheivements:
- Remove internal shader usage (only drw shaders)
- Remove viewportSize and viewportSizeInv and put them in gloabl ubo
- Fixed some drawing issues: Missing probe option and Missing Alt+B clipping of some shader
- Remove old (legacy) shaders dependancy (not using view UBO).
- Less shader variation (less compilation time at first load and less patching needed for vulkan)
- removed some geom shaders when I could
- Remove static e_data (except shaders storage where it is OK)
- Clear the way to fix some anoying limitations (dithered transparency, background image compositing etc...)
- Wireframe drawing now uses the same batching capabilities as workbench & eevee (indirect drawing).
- Reduced complexity, removed ~3000 Lines of code in draw (also removed a lot of unused shader in GPU).
- Post AA to avoid complexity and cost of MSAA.
Remaining issues:
- ~~Armature edits, overlay toggles, (... others?) are not refreshing viewport after AA is complete~~
- FXAA is not the best for wires, maybe investigate SMAA
- Maybe do something more temporally stable for AA.
- ~~Paint overlays are not working with AA.~~
- ~~infront objects are difficult to select.~~
- ~~the infront wires sometimes goes through they solid counterpart (missing clear maybe?) (toggle overlays on-off when using infront+wireframe overlay in solid shading)~~
Note: I made some decision to change slightly the appearance of some objects to simplify their drawing. Namely the empty arrows end (which is now hollow/wire) and distance points of the cameras/spots being done by lines.
Reviewed By: jbakker
Differential Revision: https://developer.blender.org/D6296
Diffstat (limited to 'source/blender/draw/CMakeLists.txt')
-rw-r--r-- | source/blender/draw/CMakeLists.txt | 208 |
1 files changed, 105 insertions, 103 deletions
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index dc5508340de..7d996f3c535 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC . intern - modes ../blenfont ../blenkernel @@ -49,8 +48,6 @@ set(INC_SYS ) set(SRC - intern/draw_anim_viz.c - intern/draw_armature.c intern/draw_cache.c intern/draw_cache_extract_mesh.c intern/draw_cache_impl_curve.c @@ -72,20 +69,6 @@ set(SRC intern/draw_manager_texture.c intern/draw_select_buffer.c intern/draw_view.c - modes/edit_armature_mode.c - modes/edit_curve_mode.c - modes/edit_lattice_mode.c - modes/edit_mesh_mode.c - modes/edit_mesh_mode_text.c - modes/edit_metaball_mode.c - modes/edit_text_mode.c - modes/object_mode.c - modes/overlay_mode.c - modes/paint_texture_mode.c - modes/paint_vertex_mode.c - modes/particle_mode.c - modes/pose_mode.c - modes/sculpt_mode.c engines/basic/basic_engine.c engines/eevee/eevee_bloom.c engines/eevee/eevee_data.c @@ -136,6 +119,25 @@ set(SRC engines/gpencil/gpencil_shader_fx.c engines/select/select_draw_utils.c engines/select/select_engine.c + engines/overlay/overlay_antialiasing.c + engines/overlay/overlay_armature.c + engines/overlay/overlay_engine.c + engines/overlay/overlay_edit_curve.c + engines/overlay/overlay_edit_text.c + engines/overlay/overlay_edit_mesh.c + engines/overlay/overlay_extra.c + engines/overlay/overlay_facing.c + engines/overlay/overlay_grid.c + engines/overlay/overlay_image.c + engines/overlay/overlay_lattice.c + engines/overlay/overlay_metaball.c + engines/overlay/overlay_motion_path.c + engines/overlay/overlay_outline.c + engines/overlay/overlay_paint.c + engines/overlay/overlay_particle.c + engines/overlay/overlay_shader.c + engines/overlay/overlay_sculpt.c + engines/overlay/overlay_wireframe.c DRW_engine.h DRW_select_buffer.h @@ -152,8 +154,7 @@ set(SRC intern/draw_manager_profiling.h intern/draw_manager_text.h intern/draw_view.h - modes/draw_mode_engines.h - modes/edit_mesh_mode_intern.h + intern/smaa_textures.h engines/basic/basic_engine.h engines/eevee/eevee_engine.h engines/eevee/eevee_lightcache.h @@ -164,6 +165,8 @@ set(SRC engines/workbench/workbench_private.h engines/select/select_engine.h engines/select/select_private.h + engines/overlay/overlay_engine.h + engines/overlay/overlay_private.h ) set(LIB @@ -261,90 +264,14 @@ data_to_c_simple(engines/workbench/shaders/workbench_volume_vert.glsl SRC) data_to_c_simple(engines/workbench/shaders/workbench_volume_frag.glsl SRC) data_to_c_simple(engines/workbench/shaders/workbench_world_light_lib.glsl SRC) -data_to_c_simple(modes/shaders/common_colormanagement_lib.glsl SRC) -data_to_c_simple(modes/shaders/common_globals_lib.glsl SRC) -data_to_c_simple(modes/shaders/common_hair_lib.glsl SRC) -data_to_c_simple(modes/shaders/common_hair_refine_vert.glsl SRC) -data_to_c_simple(modes/shaders/common_view_lib.glsl SRC) -data_to_c_simple(modes/shaders/common_fxaa_lib.glsl SRC) -data_to_c_simple(modes/shaders/common_fullscreen_vert.glsl SRC) -data_to_c_simple(modes/shaders/animviz_mpath_lines_vert.glsl SRC) -data_to_c_simple(modes/shaders/animviz_mpath_lines_geom.glsl SRC) -data_to_c_simple(modes/shaders/animviz_mpath_points_vert.glsl SRC) -data_to_c_simple(modes/shaders/armature_axes_vert.glsl SRC) -data_to_c_simple(modes/shaders/armature_sphere_solid_vert.glsl SRC) -data_to_c_simple(modes/shaders/armature_sphere_solid_frag.glsl SRC) -data_to_c_simple(modes/shaders/armature_sphere_outline_vert.glsl SRC) -data_to_c_simple(modes/shaders/armature_envelope_solid_vert.glsl SRC) -data_to_c_simple(modes/shaders/armature_envelope_solid_frag.glsl SRC) -data_to_c_simple(modes/shaders/armature_envelope_outline_vert.glsl SRC) -data_to_c_simple(modes/shaders/armature_envelope_distance_frag.glsl SRC) -data_to_c_simple(modes/shaders/armature_shape_solid_vert.glsl SRC) -data_to_c_simple(modes/shaders/armature_shape_solid_frag.glsl SRC) -data_to_c_simple(modes/shaders/armature_shape_outline_vert.glsl SRC) -data_to_c_simple(modes/shaders/armature_shape_outline_geom.glsl SRC) -data_to_c_simple(modes/shaders/armature_stick_vert.glsl SRC) -data_to_c_simple(modes/shaders/armature_stick_frag.glsl SRC) -data_to_c_simple(modes/shaders/armature_dof_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_mesh_overlay_common_lib.glsl SRC) -data_to_c_simple(modes/shaders/edit_mesh_overlay_frag.glsl SRC) -data_to_c_simple(modes/shaders/edit_mesh_overlay_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_mesh_overlay_geom.glsl SRC) -data_to_c_simple(modes/shaders/edit_mesh_overlay_mix_frag.glsl SRC) -data_to_c_simple(modes/shaders/edit_mesh_overlay_facefill_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_mesh_overlay_facefill_frag.glsl SRC) -data_to_c_simple(modes/shaders/edit_mesh_overlay_mesh_analysis_frag.glsl SRC) -data_to_c_simple(modes/shaders/edit_mesh_overlay_mesh_analysis_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_mesh_skin_root_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_curve_overlay_handle_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_curve_overlay_handle_geom.glsl SRC) -data_to_c_simple(modes/shaders/edit_curve_overlay_loosevert_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_curve_overlay_normals_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_lattice_overlay_frag.glsl SRC) -data_to_c_simple(modes/shaders/edit_lattice_overlay_loosevert_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_normals_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_normals_geom.glsl SRC) -data_to_c_simple(modes/shaders/overlay_face_orientation_frag.glsl SRC) -data_to_c_simple(modes/shaders/overlay_face_orientation_vert.glsl SRC) -data_to_c_simple(modes/shaders/overlay_face_wireframe_vert.glsl SRC) -data_to_c_simple(modes/shaders/overlay_face_wireframe_geom.glsl SRC) -data_to_c_simple(modes/shaders/overlay_face_wireframe_frag.glsl SRC) -data_to_c_simple(modes/shaders/object_camera_image_frag.glsl SRC) -data_to_c_simple(modes/shaders/object_camera_image_vert.glsl SRC) -data_to_c_simple(modes/shaders/object_color_axes_vert.glsl SRC) -data_to_c_simple(modes/shaders/object_empty_axes_vert.glsl SRC) -data_to_c_simple(modes/shaders/object_empty_image_frag.glsl SRC) -data_to_c_simple(modes/shaders/object_empty_image_vert.glsl SRC) -data_to_c_simple(modes/shaders/object_outline_resolve_frag.glsl SRC) -data_to_c_simple(modes/shaders/object_outline_expand_frag.glsl SRC) -data_to_c_simple(modes/shaders/object_outline_detect_frag.glsl SRC) -data_to_c_simple(modes/shaders/object_outline_prepass_vert.glsl SRC) -data_to_c_simple(modes/shaders/object_outline_prepass_geom.glsl SRC) -data_to_c_simple(modes/shaders/object_outline_prepass_frag.glsl SRC) -data_to_c_simple(modes/shaders/object_grid_frag.glsl SRC) -data_to_c_simple(modes/shaders/object_grid_vert.glsl SRC) -data_to_c_simple(modes/shaders/object_lightprobe_grid_vert.glsl SRC) -data_to_c_simple(modes/shaders/object_mball_handles_vert.glsl SRC) -data_to_c_simple(modes/shaders/object_particle_prim_vert.glsl SRC) -data_to_c_simple(modes/shaders/object_particle_dot_vert.glsl SRC) -data_to_c_simple(modes/shaders/object_particle_dot_frag.glsl SRC) -data_to_c_simple(modes/shaders/object_loose_points_frag.glsl SRC) -data_to_c_simple(modes/shaders/paint_texture_frag.glsl SRC) -data_to_c_simple(modes/shaders/paint_texture_vert.glsl SRC) -data_to_c_simple(modes/shaders/paint_vertex_frag.glsl SRC) -data_to_c_simple(modes/shaders/paint_vertex_vert.glsl SRC) -data_to_c_simple(modes/shaders/paint_weight_frag.glsl SRC) -data_to_c_simple(modes/shaders/paint_weight_vert.glsl SRC) -data_to_c_simple(modes/shaders/paint_face_selection_vert.glsl SRC) -data_to_c_simple(modes/shaders/paint_face_vert.glsl SRC) -data_to_c_simple(modes/shaders/paint_wire_frag.glsl SRC) -data_to_c_simple(modes/shaders/paint_wire_vert.glsl SRC) -data_to_c_simple(modes/shaders/paint_vert_frag.glsl SRC) -data_to_c_simple(modes/shaders/particle_strand_frag.glsl SRC) -data_to_c_simple(modes/shaders/particle_strand_vert.glsl SRC) -data_to_c_simple(modes/shaders/pose_selection_vert.glsl SRC) -data_to_c_simple(modes/shaders/sculpt_mask_vert.glsl SRC) -data_to_c_simple(modes/shaders/volume_velocity_vert.glsl SRC) +data_to_c_simple(intern/shaders/common_colormanagement_lib.glsl SRC) +data_to_c_simple(intern/shaders/common_globals_lib.glsl SRC) +data_to_c_simple(intern/shaders/common_hair_lib.glsl SRC) +data_to_c_simple(intern/shaders/common_hair_refine_vert.glsl SRC) +data_to_c_simple(intern/shaders/common_view_lib.glsl SRC) +data_to_c_simple(intern/shaders/common_fxaa_lib.glsl SRC) +data_to_c_simple(intern/shaders/common_smaa_lib.glsl SRC) +data_to_c_simple(intern/shaders/common_fullscreen_vert.glsl SRC) data_to_c_simple(engines/gpencil/shaders/gpencil_fill_vert.glsl SRC) data_to_c_simple(engines/gpencil/shaders/gpencil_fill_frag.glsl SRC) @@ -380,6 +307,81 @@ data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl SRC) data_to_c_simple(engines/select/shaders/selection_id_3D_vert.glsl SRC) data_to_c_simple(engines/select/shaders/selection_id_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/antialiasing_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/antialiasing_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_dof_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_envelope_outline_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_envelope_solid_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_envelope_solid_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_shape_outline_geom.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_shape_outline_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_shape_solid_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_shape_solid_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_sphere_outline_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_sphere_solid_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_sphere_solid_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_stick_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_stick_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/armature_wire_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/depth_only_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_curve_handle_geom.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_curve_handle_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_curve_point_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_curve_wire_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_lattice_point_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_lattice_wire_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_mesh_common_lib.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_mesh_facefill_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_mesh_facefill_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_mesh_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_mesh_geom.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_mesh_normal_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_mesh_analysis_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_mesh_analysis_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_mesh_skin_root_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_mesh_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_particle_strand_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_particle_point_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/extra_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/extra_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/extra_groundline_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/extra_loose_point_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/extra_loose_point_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/extra_point_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/extra_wire_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/extra_wire_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/facing_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/facing_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/grid_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/grid_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/image_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/image_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/motion_path_line_geom.glsl SRC) +data_to_c_simple(engines/overlay/shaders/motion_path_line_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/motion_path_point_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/outline_detect_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/outline_expand_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/outline_prepass_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/outline_prepass_geom.glsl SRC) +data_to_c_simple(engines/overlay/shaders/outline_prepass_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/outline_lightprobe_grid_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/outline_resolve_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/paint_face_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/paint_point_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/paint_texture_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/paint_texture_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/paint_vertcol_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/paint_vertcol_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/paint_weight_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/paint_weight_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/paint_wire_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/particle_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/particle_frag.glsl SRC) +data_to_c_simple(engines/overlay/shaders/sculpt_mask_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/volume_velocity_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/wireframe_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/wireframe_geom.glsl SRC) +data_to_c_simple(engines/overlay/shaders/wireframe_frag.glsl SRC) list(APPEND INC ) |