[Bf-blender-cvs] [b92d760] blender2.8: fix #includes for GPU debug

Mike Erwin noreply at git.blender.org
Tue Aug 16 23:15:25 CEST 2016


Commit: b92d76000d93758309c35c09f3a06c6103cc8bd0
Author: Mike Erwin
Date:   Tue Aug 16 17:14:42 2016 -0400
Branches: blender2.8
https://developer.blender.org/rBb92d76000d93758309c35c09f3a06c6103cc8bd0

fix #includes for GPU debug

Can now build release and debug.

Close to final version in master (which took several commits).

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

M	source/blender/blenlib/BLI_system.h
M	source/blender/blenlib/BLI_utildefines.h
M	source/blender/blenlib/intern/system.c
M	source/blender/gpu/GPU_debug.h
M	source/blender/gpu/intern/gpu_debug.c

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

diff --git a/source/blender/blenlib/BLI_system.h b/source/blender/blenlib/BLI_system.h
index cb8cb6f..f51b962 100644
--- a/source/blender/blenlib/BLI_system.h
+++ b/source/blender/blenlib/BLI_system.h
@@ -21,15 +21,14 @@
 #ifndef __BLI_SYSTEM_H__
 #define __BLI_SYSTEM_H__
 
+#include <stdio.h>
+
 /** \file BLI_system.h
  *  \ingroup bli
  */
 
 int BLI_cpu_support_sse2(void);
-
-#if defined(NDEBUG) || !defined(__BLI_UTILDEFINES_H__)
 void BLI_system_backtrace(FILE *fp);
-#endif
 
 /* getpid */
 #ifdef WIN32
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index d504e50..746eb92 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -633,7 +633,7 @@ extern bool BLI_memory_is_zero(const void *arr, const size_t arr_size);
  * for aborting need to define WITH_ASSERT_ABORT
  */
 #ifndef NDEBUG
-extern void BLI_system_backtrace(FILE *fp);
+#  include "BLI_system.h"
 #  ifdef WITH_ASSERT_ABORT
 #    define _BLI_DUMMY_ABORT abort
 #  else
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
index 5d1bdd6..898075e 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "BLI_utildefines.h"
 #include "BLI_system.h"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/gpu/GPU_debug.h b/source/blender/gpu/GPU_debug.h
index ec0db43..61b2bc5 100644
--- a/source/blender/gpu/GPU_debug.h
+++ b/source/blender/gpu/GPU_debug.h
@@ -34,8 +34,6 @@
 
 #include "GPU_glew.h"
 
-#include "BLI_utildefines.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/gpu/intern/gpu_debug.c b/source/blender/gpu/intern/gpu_debug.c
index 21458a2..614fdeb 100644
--- a/source/blender/gpu/intern/gpu_debug.c
+++ b/source/blender/gpu/intern/gpu_debug.c
@@ -29,7 +29,9 @@
  *  \ingroup gpu
  */
 
+#include "BLI_utildefines.h"
 #include "BLI_sys_types.h"
+#include "BLI_system.h"
 
 #include "BKE_global.h"




More information about the Bf-blender-cvs mailing list