Cleanup: draw manager headers

This commit is contained in:
2019-01-26 20:07:31 +11:00
parent b8467273b8
commit 19b5f5493c
52 changed files with 0 additions and 191 deletions

View File

@@ -31,9 +31,6 @@
#include "DRW_render.h"
#include "BKE_icons.h"
#include "BKE_idprop.h"
#include "BKE_main.h"
#include "BKE_particle.h"
#include "DNA_particle_types.h"

View File

@@ -30,11 +30,8 @@
#include "DRW_render.h"
#include "BLI_dynstr.h"
#include "BKE_global.h" /* for G.debug_value */
#include "GPU_extensions.h"
#include "GPU_texture.h"
#include "DEG_depsgraph_query.h"

View File

@@ -30,33 +30,20 @@
#include "DRW_render.h"
#include "BLI_dynstr.h"
#include "BLI_rand.h"
#include "DNA_anim_types.h"
#include "DNA_camera_types.h"
#include "DNA_object_force_types.h"
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "DNA_world_types.h"
#include "BKE_global.h" /* for G.debug_value */
#include "BKE_camera.h"
#include "BKE_mesh.h"
#include "BKE_object.h"
#include "BKE_animsys.h"
#include "BKE_screen.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
#include "eevee_private.h"
#include "GPU_extensions.h"
#include "GPU_framebuffer.h"
#include "GPU_texture.h"
#include "ED_screen.h"
static struct {
/* Depth Of Field */
struct GPUShader *dof_downsample_sh[2];

View File

@@ -32,8 +32,6 @@
#include "BKE_global.h" /* for G.debug_value */
#include "BLI_string_utils.h"
#include "eevee_private.h"
#include "GPU_texture.h"
#include "GPU_extensions.h"

View File

@@ -28,21 +28,15 @@
#include "DRW_render.h"
#include "BLI_dynstr.h"
#include "BLI_rand.h"
#include "BKE_object.h"
#include "BKE_global.h" /* for G.debug_value */
#include "BKE_screen.h"
#include "DNA_world_types.h"
#include "ED_screen.h"
#include "GPU_material.h"
#include "GPU_glew.h"
#include "eevee_engine.h"
#include "eevee_private.h"
#define EEVEE_ENGINE "BLENDER_EEVEE"

View File

@@ -31,7 +31,6 @@
#include "DRW_render.h"
#include "BKE_global.h"
#include "BKE_blender.h"
#include "BLI_threads.h"

View File

@@ -29,7 +29,6 @@
#include "DRW_render.h"
#include "BLI_utildefines.h"
#include "BLI_string_utils.h"
#include "BLI_rand.h"
#include "DNA_world_types.h"
@@ -44,15 +43,12 @@
#include "GPU_material.h"
#include "GPU_texture.h"
#include "GPU_glew.h"
#include "DEG_depsgraph_query.h"
#include "eevee_engine.h"
#include "eevee_lightcache.h"
#include "eevee_private.h"
#include "ED_screen.h"
#include "WM_api.h"
#include "WM_types.h"

View File

@@ -36,7 +36,6 @@
#include "DEG_depsgraph_query.h"
#include "eevee_engine.h"
#include "eevee_private.h"
#define SHADOW_CASTER_ALLOC_CHUNK 16

View File

@@ -37,7 +37,6 @@
#include "BKE_particle.h"
#include "BKE_paint.h"
#include "BKE_pbvh.h"
#include "BKE_studiolight.h"
#include "DNA_world_types.h"
#include "DNA_modifier_types.h"

View File

@@ -30,17 +30,14 @@
#include "DRW_render.h"
#include "BKE_global.h" /* for G.debug_value */
#include "BKE_camera.h"
#include "BKE_object.h"
#include "BKE_animsys.h"
#include "BKE_screen.h"
#include "DNA_anim_types.h"
#include "DNA_camera_types.h"
#include "DNA_screen_types.h"
#include "ED_screen.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"

View File

@@ -32,7 +32,6 @@
#include "BLI_string_utils.h"
#include "DNA_anim_types.h"
#include "DEG_depsgraph_query.h"

View File

@@ -36,7 +36,6 @@
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "BKE_camera.h"
#include "BKE_object.h"
#include "BLI_rand.h"
@@ -45,7 +44,6 @@
#include "DEG_depsgraph_query.h"
#include "GPU_framebuffer.h"
#include "GPU_glew.h"
#include "GPU_state.h"
#include "RE_pipeline.h"

View File

@@ -33,7 +33,6 @@
#include "ED_screen.h"
#include "BLI_rand.h"
#include "BLI_string_utils.h"
#include "DEG_depsgraph_query.h"

View File

@@ -37,10 +37,8 @@
#include "DNA_smoke_types.h"
#include "DNA_world_types.h"
#include "BKE_global.h" /* for G.debug_value */
#include "BKE_modifier.h"
#include "BKE_mesh.h"
#include "BKE_object.h"
#include "ED_screen.h"

View File

@@ -34,19 +34,13 @@
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "BKE_icons.h"
#include "BKE_idprop.h"
#include "BKE_main.h"
#include "ED_view3d.h"
#include "ED_screen.h"
#include "GPU_glew.h"
#include "GPU_matrix.h"
#include "GPU_shader.h"
#include "GPU_viewport.h"
#include "external_engine.h"
/* Shaders */
#define EXTERNAL_ENGINE "BLENDER_EXTERNAL"

View File

@@ -35,14 +35,11 @@
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "BKE_action.h"
#include "BKE_deform.h"
#include "BKE_gpencil.h"
#include "DRW_render.h"
#include "GPU_immediate.h"
#include "GPU_draw.h"
#include "ED_gpencil.h"
#include "ED_view3d.h"

View File

@@ -28,10 +28,8 @@
#include "BLI_polyfill_2d.h"
#include "DRW_engine.h"
#include "DRW_render.h"
#include "BKE_brush.h"
#include "BKE_gpencil.h"
#include "BKE_gpencil_modifier.h"
#include "BKE_image.h"
@@ -39,7 +37,6 @@
#include "BKE_paint.h"
#include "ED_gpencil.h"
#include "ED_view3d.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"

View File

@@ -28,10 +28,7 @@
#include "DRW_engine.h"
#include "DRW_render.h"
#include "BKE_camera.h"
#include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_gpencil.h"
#include "BKE_shader_fx.h"
#include "DNA_gpencil_types.h"
@@ -39,7 +36,6 @@
#include "draw_mode_engines.h"
#include "UI_resources.h"
#include "GPU_texture.h"
@@ -48,9 +44,7 @@
#include "DEG_depsgraph_query.h"
#include "ED_screen.h"
#include "ED_gpencil.h"
#include "WM_api.h"
extern char datatoc_gpencil_fill_vert_glsl[];
extern char datatoc_gpencil_fill_frag_glsl[];

View File

@@ -27,10 +27,8 @@
*/
#include "BLI_rect.h"
#include "DRW_engine.h"
#include "DRW_render.h"
#include "BKE_camera.h"
#include "BKE_object.h"
#include "DNA_gpencil_types.h"

View File

@@ -27,21 +27,15 @@
*/
#include "DNA_gpencil_types.h"
#include "DNA_shader_fx_types.h"
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "DNA_camera_types.h"
#include "BKE_gpencil.h"
#include "BKE_shader_fx.h"
#include "DRW_engine.h"
#include "DRW_render.h"
#include "BKE_camera.h"
#include "ED_view3d.h"
#include "ED_gpencil.h"
#include "gpencil_engine.h"
extern char datatoc_gpencil_fx_blur_frag_glsl[];

View File

@@ -28,7 +28,6 @@
#include "workbench_private.h"
#include "BIF_gl.h"
#include "BLI_alloca.h"
#include "BLI_dynstr.h"
@@ -36,7 +35,6 @@
#include "BLI_rand.h"
#include "BLI_string_utils.h"
#include "BKE_node.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BKE_particle.h"
@@ -46,7 +44,6 @@
#include "DNA_modifier_types.h"
#include "DNA_node_types.h"
#include "ED_uvedit.h"
#include "GPU_shader.h"
#include "GPU_texture.h"

View File

@@ -35,7 +35,6 @@
#include "BLI_string_utils.h"
#include "BLI_utildefines.h"
#include "BKE_node.h"
#include "BKE_particle.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
@@ -45,12 +44,10 @@
#include "DNA_modifier_types.h"
#include "DNA_node_types.h"
#include "ED_uvedit.h"
#include "GPU_shader.h"
#include "GPU_texture.h"
#include "UI_resources.h"
/* *********** STATIC *********** */
static struct {

View File

@@ -27,13 +27,11 @@
*/
#include "BKE_studiolight.h"
#include "DRW_engine.h"
#include "workbench_private.h"
#include "BKE_object.h"
#include "BLI_math.h"
#include "BKE_global.h"
void studiolight_update_world(WORKBENCH_PrivateData *wpd, StudioLight *studiolight, WORKBENCH_UBO_World *wd)
{

View File

@@ -28,7 +28,6 @@
#include "workbench_private.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BLI_rand.h"

View File

@@ -33,20 +33,14 @@
#include "BLI_sys_types.h"
#include "DNA_anim_types.h"
#include "DNA_armature_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "DNA_object_types.h"
#include "BLI_math.h"
#include "BLI_dlrbTree.h"
#include "BKE_animsys.h"
#include "BKE_action.h"
#include "ED_keyframes_draw.h"
#include "UI_resources.h"
@@ -57,12 +51,10 @@
#include "GPU_shader.h"
#include "GPU_immediate.h"
#include "GPU_matrix.h"
#include "draw_common.h"
#include "draw_manager_text.h"
#include "draw_mode_engines.h"
/* ********************************* Lists ************************************** */
/* All lists are per viewport specific datas.

View File

@@ -30,35 +30,22 @@
#include <string.h>
#include <math.h>
#include "DNA_anim_types.h"
#include "DNA_armature_types.h"
#include "DNA_constraint_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "DNA_object_types.h"
#include "DRW_render.h"
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_dlrbTree.h"
#include "BLI_utildefines.h"
#include "BKE_animsys.h"
#include "BKE_action.h"
#include "BKE_armature.h"
#include "BKE_global.h"
#include "BKE_modifier.h"
#include "BKE_nla.h"
#include "BKE_curve.h"
#include "BIF_gl.h"
#include "ED_armature.h"
#include "ED_keyframes_draw.h"
#include "GPU_select.h"
#include "UI_resources.h"

View File

@@ -39,14 +39,11 @@
#include "BLI_utildefines.h"
#include "BLI_math.h"
#include "BLI_listbase.h"
#include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_object_deform.h"
#include "GPU_batch.h"
#include "GPU_batch_presets.h"
#include "GPU_batch_utils.h"
#include "MEM_guardedalloc.h"

View File

@@ -29,7 +29,6 @@
* \note DispList may be removed soon! This is a utility for object types that use render.
*/
#include "MEM_guardedalloc.h"
#include "BLI_alloca.h"
#include "BLI_utildefines.h"

View File

@@ -35,7 +35,6 @@
#include "BLI_utildefines.h"
#include "BLI_math_vector.h"
#include "BLI_math_bits.h"
#include "BLI_math_color.h"
#include "BLI_string.h"
#include "BLI_alloca.h"
#include "BLI_edgehash.h"
@@ -43,7 +42,6 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_space_types.h"
#include "DNA_scene_types.h"
#include "BKE_customdata.h"
@@ -54,23 +52,16 @@
#include "BKE_mesh.h"
#include "BKE_mesh_tangent.h"
#include "BKE_mesh_runtime.h"
#include "BKE_object.h"
#include "BKE_object_deform.h"
#include "BKE_colorband.h"
#include "BKE_cdderivedmesh.h"
#include "DEG_depsgraph_query.h"
#include "bmesh.h"
#include "GPU_batch.h"
#include "GPU_batch_presets.h"
#include "GPU_draw.h"
#include "GPU_material.h"
#include "DRW_render.h"
#include "ED_image.h"
#include "ED_mesh.h"
#include "ED_uvedit.h"

View File

@@ -39,7 +39,6 @@
#include "GPU_batch.h"
#include "DRW_render.h"
#include "draw_cache_impl.h" /* own include */

View File

@@ -44,9 +44,7 @@
#include "DNA_particle_types.h"
#include "DNA_customdata_types.h"
#include "BKE_lattice.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"

View File

@@ -34,18 +34,12 @@
#include "BLI_utildefines.h"
#include "BLI_string_utils.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
#include "DNA_particle_types.h"
#include "DNA_customdata_types.h"
#include "BKE_anim.h"
#include "BKE_mesh.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "ED_particle.h"
#include "GPU_batch.h"
#include "GPU_shader.h"

View File

@@ -38,11 +38,9 @@
#include "BKE_colortools.h"
#include "BKE_global.h"
#include "BKE_mesh.h"
#include "BKE_object.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_workspace.h"
#include "draw_manager.h"
#include "DNA_camera_types.h"
@@ -53,7 +51,6 @@
#include "ED_space_api.h"
#include "ED_screen.h"
#include "ED_gpencil.h"
#include "ED_particle.h"
#include "ED_view3d.h"
#include "GPU_draw.h"
@@ -69,7 +66,6 @@
#include "RE_engine.h"
#include "RE_pipeline.h"
#include "UI_interface.h"
#include "UI_resources.h"
#include "WM_api.h"

View File

@@ -30,18 +30,14 @@
#include "BLI_mempool.h"
#include "BIF_glutil.h"
#include "BKE_global.h"
#include "BKE_object.h"
#include "GPU_draw.h"
#include "GPU_extensions.h"
#include "intern/gpu_shader_private.h"
#ifdef USE_GPU_SELECT
# include "ED_view3d.h"
# include "ED_armature.h"
# include "GPU_select.h"
#endif

View File

@@ -37,13 +37,10 @@
#include "draw_manager.h"
#include "GPU_glew.h"
#include "GPU_texture.h"
#include "UI_resources.h"
#include "WM_api.h"
#include "WM_types.h"
#include "draw_manager_profiling.h"

View File

@@ -31,10 +31,8 @@
#include "DNA_material_types.h"
#include "BLI_listbase.h"
#include "BLI_string.h"
#include "BLI_string_utils.h"
#include "BLI_threads.h"
#include "BLI_task.h"
#include "BKE_global.h"
#include "BKE_main.h"

View File

@@ -28,17 +28,14 @@
#include "MEM_guardedalloc.h"
#include "BLI_listbase.h"
#include "BLI_string.h"
#include "BLI_math.h"
#include "BIF_gl.h"
#include "GPU_matrix.h"
#include "ED_screen.h"
#include "ED_view3d.h"
#include "UI_resources.h"
#include "UI_interface.h"
#include "WM_api.h"

View File

@@ -31,27 +31,21 @@
#include "DNA_brush_types.h"
#include "DNA_screen_types.h"
#include "DNA_userdef_types.h"
#include "DNA_world_types.h"
#include "DNA_view3d_types.h"
#include "ED_screen.h"
#include "ED_transform.h"
#include "ED_view3d.h"
#include "GPU_draw.h"
#include "GPU_shader.h"
#include "GPU_immediate.h"
#include "GPU_matrix.h"
#include "UI_resources.h"
#include "WM_api.h"
#include "WM_types.h"
#include "BKE_global.h"
#include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_unit.h"
#include "DRW_render.h"

View File

@@ -34,10 +34,6 @@
#include "draw_common.h"
#include "draw_mode_engines.h"
/* *********** LISTS *********** */
typedef struct EDIT_ARMATURE_PassList {
struct DRWPass *bone_solid[2];

View File

@@ -36,11 +36,9 @@
/* If builtin shaders are needed */
#include "GPU_shader.h"
#include "GPU_batch.h"
#include "draw_common.h"
#include "draw_mode_engines.h"
/* If needed, contains all global/Theme colors
* Add needed theme colors / values to DRW_globals_update() and update UBO

View File

@@ -36,7 +36,6 @@
#include "draw_common.h"
#include "draw_mode_engines.h"
#include "draw_builtin_shader.h"
extern char datatoc_common_world_clip_lib_glsl[];

View File

@@ -35,9 +35,6 @@
#include "ED_view3d.h"
#include "GPU_shader.h"
#include "GPU_viewport.h"
#include "DNA_mesh_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

View File

@@ -26,23 +26,19 @@
* \ingroup draw
*/
#include "DRW_engine.h"
#include "DRW_render.h"
#include "DNA_meta_types.h"
#include "BKE_object.h"
#include "BKE_mball.h"
#include "ED_mball.h"
/* If builtin shaders are needed */
#include "GPU_shader.h"
#include "GPU_select.h"
#include "draw_common.h"
#include "draw_mode_engines.h"
/* *********** LISTS *********** */
/* All lists are per viewport specific datas.

View File

@@ -37,12 +37,9 @@
/* If builtin shaders are needed */
#include "GPU_shader.h"
#include "GPU_batch.h"
#include "draw_common.h"
#include "draw_mode_engines.h"
/* *********** LISTS *********** */
/* All lists are per viewport specific datas.
* They are all free when viewport changes engines

View File

@@ -45,24 +45,19 @@
#include "DNA_view3d_types.h"
#include "DNA_world_types.h"
#include "BIF_gl.h"
#include "BLI_string_utils.h"
#include "BKE_anim.h"
#include "BKE_camera.h"
#include "BKE_constraint.h"
#include "BKE_curve.h"
#include "BKE_editmesh.h"
#include "BKE_global.h"
#include "BKE_mball.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_movieclip.h"
#include "BKE_object.h"
#include "BKE_particle.h"
#include "BKE_image.h"
#include "BKE_texture.h"
#include "BKE_tracking.h"
#include "ED_view3d.h"

View File

@@ -34,10 +34,8 @@
#include "BKE_global.h"
#include "GPU_shader.h"
#include "GPU_extensions.h"
#include "DRW_render.h"
#include "draw_mode_engines.h"
/* Structures */
typedef struct OVERLAY_StorageList {

View File

@@ -39,7 +39,6 @@
#include "draw_common.h"
#include "draw_mode_engines.h"
#include "DNA_mesh_types.h"

View File

@@ -26,7 +26,6 @@
* \ingroup draw
*/
#include "DRW_engine.h"
#include "DRW_render.h"
/* If builtin shaders are needed */
@@ -34,7 +33,6 @@
#include "draw_common.h"
#include "draw_mode_engines.h"
#include "DNA_mesh_types.h"
#include "DNA_view3d_types.h"

View File

@@ -26,7 +26,6 @@
* \ingroup draw
*/
#include "DRW_engine.h"
#include "DRW_render.h"
/* If builtin shaders are needed */
@@ -34,13 +33,9 @@
#include "draw_common.h"
#include "draw_mode_engines.h"
#include "DNA_mesh_types.h"
#include "DNA_view3d_types.h"
#include "BKE_mesh.h"
#include "DEG_depsgraph_query.h"
extern char datatoc_common_world_clip_lib_glsl[];

View File

@@ -26,29 +26,21 @@
* \ingroup draw
*/
#include "DRW_engine.h"
#include "DRW_render.h"
#include "DNA_mesh_types.h"
#include "DNA_object_types.h"
#include "DNA_particle_types.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "GPU_shader.h"
#include "GPU_batch.h"
#include "draw_common.h"
#include "draw_mode_engines.h"
#include "ED_particle.h"
#include "DEG_depsgraph_query.h"
#include "draw_cache_impl.h"
extern char datatoc_particle_strand_vert_glsl[];
extern char datatoc_particle_strand_frag_glsl[];
extern char datatoc_common_globals_lib_glsl[];

View File

@@ -38,9 +38,6 @@
#include "draw_common.h"
#include "draw_mode_engines.h"
/* *********** LISTS *********** */
/* All lists are per viewport specific datas.
* They are all free when viewport changes engines

View File

@@ -36,16 +36,11 @@
#include "BKE_pbvh.h"
#include "BKE_paint.h"
#include "DEG_depsgraph.h"
/* If builtin shaders are needed */
#include "GPU_shader.h"
#include "GPU_matrix.h"
#include "draw_common.h"
#include "draw_mode_engines.h"
extern char datatoc_sculpt_mask_vert_glsl[];
extern char datatoc_gpu_shader_flat_color_frag_glsl[];
extern char datatoc_gpu_shader_3D_smooth_color_frag_glsl[];