[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47574] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern: fixed some macro wierdness ( always use parenthesis).

[Jason Wilkins]

Revision: 47574
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47574
Author:   jwilkins
Date:     2012-06-07 15:25:14 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
fixed some macro wierdness (always use parenthesis).  The other changes are just formatting

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c	2012-06-07 15:20:51 UTC (rev 47573)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c	2012-06-07 15:25:14 UTC (rev 47574)
@@ -504,7 +504,7 @@
 /* vertex formats */
 
 #if GPU_SAFETY
-void gpu_ImmediateFormat_V2(const char* file, int line)
+void gpuSafetyImmediateFormat_V2(const char* file, int line)
 #else
 void gpuImmediateFormat_V2(void)
 #endif
@@ -521,7 +521,7 @@
 }
 
 #if GPU_SAFETY
-void gpu_ImmediateFormat_C4_V2(const char* file, int line)
+void gpuSafetyImmediateFormat_C4_V2(const char* file, int line)
 #else
 void gpuImmediateFormat_C4_V2(void)
 #endif
@@ -538,7 +538,7 @@
 }
 
 #if GPU_SAFETY
-void gpu_ImmediateFormat_T2_V2(const char* file, int line)
+void gpuSafetyImmediateFormat_T2_V2(const char* file, int line)
 #else
 void gpuImmediateFormat_T2_V2(void)
 #endif
@@ -562,7 +562,7 @@
 }
 
 #if GPU_SAFETY
-void gpu_ImmediateFormat_T2_C4_V2(const char* file, int line)
+void gpuSafetyImmediateFormat_T2_C4_V2(const char* file, int line)
 #else
 void gpuImmediateFormat_T2_C4_V2(void)
 #endif
@@ -586,7 +586,7 @@
 }
 
 #if GPU_SAFETY
-void gpu_ImmediateFormat_V3(const char* file, int line)
+void gpuSafetyImmediateFormat_V3(const char* file, int line)
 #else
 void gpuImmediateFormat_V3(void)
 #endif
@@ -603,7 +603,7 @@
 }
 
 #if GPU_SAFETY
-void gpu_ImmediateFormat_N3_V3(const char* file, int line)
+void gpuSafetyImmediateFormat_N3_V3(const char* file, int line)
 #else
 void gpuImmediateFormat_N3_V3(void)
 #endif
@@ -620,7 +620,7 @@
 }
 
 #if GPU_SAFETY
-void gpu_ImmediateFormat_C4_V3(const char* file, int line)
+void gpuSafetyImmediateFormat_C4_V3(const char* file, int line)
 #else
 void gpuImmediateFormat_C4_V3(void)
 #endif
@@ -637,7 +637,7 @@
 }
 
 #if GPU_SAFETY
-void gpu_ImmediateFormat_C4_N3_V3(const char* file, int line)
+void gpuSafetyImmediateFormat_C4_N3_V3(const char* file, int line)
 #else
 void gpuImmediateFormat_C4_N3_V3(void)
 #endif
@@ -654,7 +654,7 @@
 }
 
 #if GPU_SAFETY
-void gpu_ImmediateFormat_T2_C4_N3_V3(const char* file, int line)
+void gpuSafetyImmediateFormat_T2_C4_N3_V3(const char* file, int line)
 #else
 void gpuImmediateFormat_T2_C4_N3_V3(void)
 #endif
@@ -678,7 +678,7 @@
 }
 
 #if GPU_SAFETY
-void gpu_ImmediateFormat_T3_C4_V3(const char* file, int line)
+void gpuSafetyImmediateFormat_T3_C4_V3(const char* file, int line)
 #else
 void gpuImmediateFormat_T3_C4_V3(void)
 #endif
@@ -702,7 +702,7 @@
 }
 
 #if GPU_SAFETY
-void gpu_ImmediateUnformat(const char* file, int line)
+void gpuSafetyImmediateUnformat(const char* file, int line)
 #else
 void gpuImmediateUnformat(void)
 #endif

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h	2012-06-07 15:20:51 UTC (rev 47573)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h	2012-06-07 15:25:14 UTC (rev 47574)
@@ -51,7 +51,7 @@
 
 
 #ifndef GPU_SAFETY
-#define GPU_SAFETY DEBUG && WITH_GPU_SAFETY
+#define GPU_SAFETY (DEBUG && WITH_GPU_SAFETY)
 #endif
 
 #if GPU_SAFETY
@@ -269,8 +269,34 @@
 
 
 /* utility functions to setup vertex format and lock */
-#if !GPU_SAFETY
+#if GPU_SAFETY
 
+void gpuSafetyImmediateFormat_V2          (const char* file, int line);
+void gpuSafetyImmediateFormat_C4_V2       (const char* file, int line);
+void gpuSafetyImmediateFormat_T2_V2       (const char* file, int line);
+void gpuSafetyImmediateFormat_T2_C4_V2    (const char* file, int line);
+void gpuSafetyImmediateFormat_V3          (const char* file, int line);
+void gpuSafetyImmediateFormat_N3_V3       (const char* file, int line);
+void gpuSafetyImmediateFormat_C4_V3       (const char* file, int line);
+void gpuSafetyImmediateFormat_C4_N3_V3    (const char* file, int line);
+void gpuSafetyImmediateFormat_T2_C4_N3_V3 (const char* file, int line);
+void gpuSafetyImmediateFormat_T3_C4_V3    (const char* file, int line);
+void gpuSafetyImmediateUnformat           (const char* file, int line);
+
+#define gpuImmediateFormat_V2()          gpuSafetyImmediateFormat_V2          (__FILE__, __LINE__)
+#define gpuImmediateFormat_C4_V2()       gpuSafetyImmediateFormat_C4_V2       (__FILE__, __LINE__)
+#define gpuImmediateFormat_T2_V2()       gpuSafetyImmediateFormat_T2_V2       (__FILE__, __LINE__)
+#define gpuImmediateFormat_T2_C4_V2()    gpuSafetyImmediateFormat_T2_C4_V2    (__FILE__, __LINE__)
+#define gpuImmediateFormat_V3()          gpuSafetyImmediateFormat_V3          (__FILE__, __LINE__)
+#define gpuImmediateFormat_N3_V3()       gpuSafetyImmediateFormat_N3_V3       (__FILE__, __LINE__)
+#define gpuImmediateFormat_C4_V3()       gpuSafetyImmediateFormat_C4_V3       (__FILE__, __LINE__)
+#define gpuImmediateFormat_C4_N3_V3()    gpuSafetyImmediateFormat_C4_N3_V3    (__FILE__, __LINE__)
+#define gpuImmediateFormat_T2_C4_N3_V3() gpuSafetyImmediateFormat_T2_C4_N3_V3 (__FILE__, __LINE__)
+#define gpuImmediateFormat_T3_C4_V3()    gpuSafetyImmediateFormat_T3_C4_V3    (__FILE__, __LINE__)
+#define gpuImmediateUnformat()           gpuSafetyImmediateUnformat           (__FILE__, __LINE__)
+
+#else
+
 void gpuImmediateFormat_V2(void);
 void gpuImmediateFormat_C4_V2(void);
 void gpuImmediateFormat_T2_V2(void);
@@ -283,32 +309,6 @@
 void gpuImmediateFormat_T3_C4_V3(void);
 void gpuImmediateUnformat(void);
 
-#else
-
-void gpu_ImmediateFormat_V2(const char* file, int line);
-void gpu_ImmediateFormat_C4_V2(const char* file, int line);
-void gpu_ImmediateFormat_T2_V2(const char* file, int line);
-void gpu_ImmediateFormat_T2_C4_V2(const char* file, int line);
-void gpu_ImmediateFormat_V3(const char* file, int line);
-void gpu_ImmediateFormat_N3_V3(const char* file, int line);
-void gpu_ImmediateFormat_C4_V3(const char* file, int line);
-void gpu_ImmediateFormat_C4_N3_V3(const char* file, int line);
-void gpu_ImmediateFormat_T2_C4_N3_V3(const char* file, int line);
-void gpu_ImmediateFormat_T3_C4_V3(const char* file, int line);
-void gpu_ImmediateUnformat(const char* file, int line);
-
-#define gpuImmediateFormat_V2() gpu_ImmediateFormat_V2(__FILE__, __LINE__)
-#define gpuImmediateFormat_C4_V2() gpu_ImmediateFormat_C4_V2(__FILE__, __LINE__)
-#define gpuImmediateFormat_T2_V2() gpu_ImmediateFormat_T2_V2(__FILE__, __LINE__)
-#define gpuImmediateFormat_T2_C4_V2() gpu_ImmediateFormat_T2_C4_V2(__FILE__, __LINE__)
-#define gpuImmediateFormat_V3() gpu_ImmediateFormat_V3(__FILE__, __LINE__)
-#define gpuImmediateFormat_N3_V3() gpu_ImmediateFormat_N3_V3(__FILE__, __LINE__)
-#define gpuImmediateFormat_C4_V3() gpu_ImmediateFormat_C4_V3(__FILE__, __LINE__)
-#define gpuImmediateFormat_C4_N3_V3() gpu_ImmediateFormat_C4_N3_V3(__FILE__, __LINE__)
-#define gpuImmediateFormat_T2_C4_N3_V3() gpu_ImmediateFormat_T2_C4_N3_V3(__FILE__, __LINE__)
-#define gpuImmediateFormat_T3_C4_V3() gpu_ImmediateFormat_T3_C4_V3(__FILE__, __LINE__)
-#define gpuImmediateUnformat() gpu_ImmediateUnformat(__FILE__, __LINE__)
-
 #endif