Ivan Gyurdiev : wined3d: Print all errors in checkGLcall.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 634698cb192f87cfe9eea89ca0b9ac3e252a0b59
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=634698cb192f87cfe9eea89ca0b9ac3e252a0b59

Author: Ivan Gyurdiev <ivg2 at cornell.edu>
Date:   Mon Apr 10 00:39:07 2006 -0400

wined3d: Print all errors in checkGLcall.

---

 dlls/wined3d/wined3d_private.h |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index efaeea2..d5d5cce 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -233,15 +233,18 @@ extern int num_lock;
 
 /* Checking of API calls */
 /* --------------------- */
-#define checkGLcall(A) \
-{ \
-    GLint err = glGetError();   \
-    if (err != GL_NO_ERROR) { \
-       FIXME(">>>>>>>>>>>>>>>>> %x from %s @ %s / %d\n", err, A, __FILE__, __LINE__); \
-    } else { \
-       TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \
-    } \
-}
+#define checkGLcall(A)                                          \
+{                                                               \
+    GLint err = glGetError();                                   \
+    if (err == GL_NO_ERROR) {                                   \
+       TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__);    \
+                                                                \
+    } else do {                                                 \
+       FIXME(">>>>>>>>>>>>>>>>> %x from %s @ %s / %d\n",        \
+		err, A, __FILE__, __LINE__);                    \
+       err = glGetError();                                      \
+    } while (err != GL_NO_ERROR);                               \
+} 
 
 /* Trace routines / diagnostics */
 /* ---------------------------- */
@@ -312,14 +315,18 @@ extern const float identity[16];
 #endif
 
 /* Checking of per-vertex related GL calls */
-#define vcheckGLcall(A) \
-{ \
-    GLint err = glGetError();   \
-    if (err != GL_NO_ERROR) { \
-       FIXME(">>>>>>>>>>>>>>>>> %x from %s @ %s / %d\n", err, A, __FILE__, __LINE__); \
-    } else { \
+/* --------------------- */
+#define vcheckGLcall(A)                                         \
+{                                                               \
+    GLint err = glGetError();                                   \
+    if (err == GL_NO_ERROR) {                                   \
        VTRACE(("%s call ok %s / %d\n", A, __FILE__, __LINE__)); \
-    } \
+                                                                \
+    } else do {                                                 \
+       FIXME(">>>>>>>>>>>>>>>>> %x from %s @ %s / %d\n",        \
+                err, A, __FILE__, __LINE__);                    \
+       err = glGetError();                                      \
+    } while (err != GL_NO_ERROR);                               \
 }
 
 /* TODO: Confirm each of these works when wined3d move completed */