[PATCH v6 09/12] opengl32: Use the +opengl debug channel everywhere.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/opengl32/make_opengl   |  2 +-
 dlls/opengl32/unix_thunks.c |  2 +-
 dlls/opengl32/unix_wgl.c    |  2 +-
 dlls/opengl32/wgl.c         | 15 ++++++++-------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 43199f56981..a6b1a974003 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -1126,7 +1126,7 @@ print OUT "#include "unix_private.h"\n\n";
 print OUT "#include "wine/debug.h"\n\n";

print OUT "#ifdef _WIN64\n";
-print OUT "WINE_DEFAULT_DEBUG_CHANNEL(wgl);\n";
+print OUT "WINE_DEFAULT_DEBUG_CHANNEL(opengl);\n";
 print OUT "#endif\n\n";

print OUT "extern NTSTATUS thread_attach( void *args ) DECLSPEC_HIDDEN;\n";
diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c
index 1ba8fc3bf2f..d75acc8eee9 100644
--- a/dlls/opengl32/unix_thunks.c
+++ b/dlls/opengl32/unix_thunks.c
@@ -19,7 +19,7 @@
 #include "wine/debug.h"

#ifdef _WIN64
-WINE_DEFAULT_DEBUG_CHANNEL(wgl);
+WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 #endif

extern NTSTATUS thread_attach( void *args ) DECLSPEC_HIDDEN;
diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c
index a963ba0e110..bbfe0980a95 100644
--- a/dlls/opengl32/unix_wgl.c
+++ b/dlls/opengl32/unix_wgl.c
@@ -41,7 +41,7 @@

#include "wine/debug.h"

-WINE_DEFAULT_DEBUG_CHANNEL(wgl);
+WINE_DEFAULT_DEBUG_CHANNEL(opengl);

static pthread_mutex_t wgl_lock = PTHREAD_MUTEX_INITIALIZER;

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index a8318fcd21f..4a5394c7667 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -36,7 +36,7 @@
 #include "wine/glu.h"
 #include "wine/debug.h"

-WINE_DEFAULT_DEBUG_CHANNEL(wgl);
+WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 WINE_DECLARE_DEBUG_CHANNEL(fps);

unixlib_handle_t unixlib_handle = 0;
@@ -120,11 +120,11 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd)
     int i, count, best_format;
     int bestDBuffer = -1, bestStereo = -1;

-    TRACE_(wgl)( "%p %p: size %u version %u flags %lu type %u color %u %u,%u,%u,%u "
-                 "accum %u depth %u stencil %u aux %u\n",
-                 hdc, ppfd, ppfd->nSize, ppfd->nVersion, ppfd->dwFlags, ppfd->iPixelType,
-                 ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits,
-                 ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers );
+    TRACE( "%p %p: size %u version %u flags %lu type %u color %u %u,%u,%u,%u "
+           "accum %u depth %u stencil %u aux %u\n",
+           hdc, ppfd, ppfd->nSize, ppfd->nVersion, ppfd->dwFlags, ppfd->iPixelType,
+           ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits,
+           ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers );

count = wglDescribePixelFormat( hdc, 0, 0, NULL );
     if (!count) return 0;
@@ -486,7 +486,8 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l
              if (!ret) break;
          }

-         if (TRACE_ON(wgl)) {
+         if (TRACE_ON(opengl))
+         {
              unsigned int bitmask;
              unsigned char *bitmap_ = bitmap;