Cleanup: GPU headers
authorCampbell Barton <ideasman42@gmail.com>
Wed, 8 Jun 2016 19:37:46 +0000 (05:37 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 8 Jun 2016 19:38:43 +0000 (05:38 +1000)
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_compositing.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_framebuffer.c
source/blender/gpu/intern/gpu_init_exit.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_shader.c
source/blender/gpu/intern/gpu_texture.c

index 2c6f204d9d0f6a9a5ad6272709eeefb3198997eb..e8605e27595682590ff5924c79ef18a5eaae73ec 100644 (file)
@@ -53,8 +53,6 @@
 #include "BKE_mesh.h"
 #include "BKE_pbvh.h"
 
-#include "DNA_userdef_types.h"
-
 #include "GPU_buffers.h"
 #include "GPU_draw.h"
 #include "GPU_basic_shader.h"
index c2a2b1804caff5f3de8ce6375cd682393e076411..964c2b5051ec464637dda648f07faf440f03a3e7 100644 (file)
 #include "BLI_sys_types.h"
 #include "BLI_rect.h"
 #include "BLI_math.h"
-#include "BLI_listbase.h"
-#include "BLI_linklist.h"
 
 #include "BLI_rand.h"
 
 #include "DNA_vec_types.h"
-#include "DNA_view3d_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_object_types.h"
-#include "DNA_camera_types.h"
 #include "DNA_gpu_types.h"
 
 #include "GPU_compositing.h"
index e5d51772bb2af2ef197277833457f267f92f0622..bb45c3e507bf51589ad5c594a12ba91d4030e734 100644 (file)
@@ -39,7 +39,6 @@
 #include <string.h>
 
 #include "GPU_glew.h"
-#include "GPU_debug.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_linklist.h"
@@ -70,9 +69,7 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_node.h"
-#include "BKE_object.h"
 #include "BKE_scene.h"
-#include "BKE_subsurf.h"
 #include "BKE_DerivedMesh.h"
 
 #include "GPU_basic_shader.h"
 
 #include "PIL_time.h"
 
-#include "smoke_API.h"
+#ifdef WITH_SMOKE
+#  include "smoke_API.h"
+#endif
 
 #ifdef WITH_OPENSUBDIV
+#  include "BKE_subsurf.h"
+#  include "BKE_DerivedMesh.h"
 #  include "BKE_editmesh.h"
 
 #  include "gpu_codegen.h"
index 3c96b628cd6d28c0cf055dc1ba183a6817b8f66b..b8a39c811229aa6d5c7d806299ed6bdf5c6a5eb8 100644 (file)
@@ -32,9 +32,6 @@
  * with checks for drivers and GPU support.
  */
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 #include "BLI_math_base.h"
 #include "BLI_math_vector.h"
@@ -42,7 +39,6 @@
 #include "BKE_global.h"
 
 #include "GPU_basic_shader.h"
-#include "GPU_draw.h"
 #include "GPU_extensions.h"
 #include "GPU_glew.h"
 #include "GPU_texture.h"
index a6d120b8943033f918d9a0ffd8f3a47d5b06847d..c0400cdb04cc082291738bb26afc14546bffb050 100644 (file)
@@ -29,8 +29,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
-#include "BLI_math_base.h"
-#include "BLI_math_vector.h"
 
 #include "BKE_global.h"
 
index 8fed6a9ee80386f147fd3d50b947dbf6ad6a790b..c72c83b6b07cfed02d5613657769fe264ed3e403 100644 (file)
  *  \ingroup gpu
  */
 
-#include "BKE_DerivedMesh.h"
-
 #include "BLI_sys_types.h"
 #include "GPU_init_exit.h"  /* interface */
-#include "GPU_buffers.h"
 
 #include "BKE_global.h"
 
index 02f58ea6df2afa17c58751803c14ac74b654f2ac..f14b2e6e170c7b318b402363e8db797d85b34353 100644 (file)
@@ -31,7 +31,6 @@
  * Manages materials, lights and textures.
  */
 
-
 #include <math.h>
 #include <string.h>
 
@@ -49,7 +48,6 @@
 
 #include "BKE_anim.h"
 #include "BKE_colortools.h"
-#include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
@@ -68,7 +66,9 @@
 
 #include "gpu_codegen.h"
 
-#include <string.h>
+#ifdef WITH_OPENSUBDIV
+#  include "BKE_DerivedMesh.h"
+#endif
 
 /* Structs */
 
index 25352001056d891002ddaf777b0c3e88244f8bac..5a1b38e6be72d3ece65e8ceb1c924ad6bf3cd315 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 #include "BLI_math_base.h"
 #include "BLI_math_vector.h"
index 294b08f155a679cc74e6a73f52026852bdf862e9..827c52c9a5f8b5d89928c620884137a928dfb17d 100644 (file)
@@ -32,7 +32,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 #include "BLI_math_base.h"
-#include "BLI_math_vector.h"
 
 #include "BKE_global.h"