[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47349] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern: Fixed a build error that occurred when compiling WITH_GPU_SAFETY

[Jason Wilkins]

Revision: 47349
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47349
Author:   jwilkins
Date:     2012-06-02 18:43:05 +0000 (Sat, 02 Jun 2012)
Log Message:
-----------
Fixed a build error that occurred when compiling WITH_GPU_SAFETY

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

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-02 17:44:28 UTC (rev 47348)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h	2012-06-02 18:43:05 UTC (rev 47349)
@@ -83,12 +83,6 @@
 #define GPU_CHECK_NO_LOCK(var) \
     GPU_SAFE_RETURN(GPU_IMMEDIATE->lockCount == 0, var);
 
-#define GPU_CHECK_BUFFER_BEGIN(var) \
-    GPU_SAFE_RETURN(GPU_IMMEDIATE->bufferBegin != NULL, var);
-
-#define GPU_CHECK_BUFFER_END(var) \
-    GPU_SAFE_RETURN(GPU_IMMEDIATE->bufferEnd != NULL, var);
-
 /* Each block contains variables that can be inspected by a
    debugger in the event that an assert is triggered. */
 
@@ -97,11 +91,9 @@
     GLboolean immediateOK;                \
     GLboolean isLockedOK;                 \
     GLboolean noBeginOK;                  \
-    GLboolean bufferBeginOK;              \
     GPU_CHECK_BASE(immediateOK);          \
     GPU_CHECK_IS_LOCKED(isLockedOK)       \
     GPU_CHECK_NO_BEGIN(noBeginOK)         \
-    GPU_CHECK_BUFFER_BEGIN(bufferBeginOK) \
     }
 
 #define GPU_CHECK_CAN_END()             \
@@ -109,11 +101,9 @@
     GLboolean immediateOK;              \
     GLboolean isLockedOK;               \
     GLboolean hasBegunOK;               \
-    GLboolean bufferBeginOK;            \
     GPU_CHECK_BASE(immediateOK);        \
     GPU_CHECK_IS_LOCKED(isLockedOK)     \
     GPU_CHECK_HAS_BEGUN(hasBegunOK)     \
-    GPU_CHECK_BUFFER_END(bufferBeginOK) \
     }
 
 #define GPU_CHECK_CAN_CURRENT()  \

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_internal.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_internal.h	2012-06-02 17:44:28 UTC (rev 47348)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_internal.h	2012-06-02 18:43:05 UTC (rev 47349)
@@ -73,10 +73,8 @@
     {                                   \
     GLboolean immediateOK;              \
     GLboolean noBeginOK;                \
-    GLboolean bufferLockOK;             \
     GPU_CHECK_BASE(immediateOK);        \
     GPU_CHECK_NO_BEGIN(noBeginOK)       \
-    GPU_CHECK_BUFFER_LOCK(bufferLockOK) \
     }
 
 #define GPU_CHECK_CAN_UNLOCK()              \
@@ -84,11 +82,9 @@
     GLboolean immediateOK;                  \
     GLboolean isLockedOK;                   \
     GLboolean noBeginOK;                    \
-    GLboolean bufferUnlockOK;               \
     GPU_CHECK_BASE(immediateOK);            \
     GPU_CHECK_IS_LOCKED(isLockedOK)         \
     GPU_CHECK_NO_BEGIN(noBeginOK)           \
-    GPU_CHECK_BUFFER_UNLOCK(bufferUnlockOK) \
     }
 
 #define GPU_SAFE_STMT(var, test, stmt) \