[OPENGL32]

* Move wine/debug.h inclusion to the main header.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61729
This commit is contained in:
Amine Khaldi 2014-01-20 13:07:26 +00:00
parent bdbf7cd306
commit 909dd423a0
5 changed files with 4 additions and 6 deletions

View file

@ -6,9 +6,9 @@
*/ */
#include "opengl32.h" #include "opengl32.h"
#include <winreg.h> #include <winreg.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(opengl32); WINE_DEFAULT_DEBUG_CHANNEL(opengl32);
struct Drv_Opengl_Info struct Drv_Opengl_Info

View file

@ -16,6 +16,8 @@
#include <winddi.h> #include <winddi.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <wine/debug.h>
#include "icd.h" #include "icd.h"
struct wgl_context struct wgl_context

View file

@ -9,7 +9,6 @@
/* MESA includes */ /* MESA includes */
#include <main/context.h> #include <main/context.h>
#include <main/formats.h>
#include <main/framebuffer.h> #include <main/framebuffer.h>
#include <main/renderbuffer.h> #include <main/renderbuffer.h>
#include <main/shared.h> #include <main/shared.h>
@ -17,13 +16,11 @@
#include <swrast/s_context.h> #include <swrast/s_context.h>
#include <swrast/s_renderbuffer.h> #include <swrast/s_renderbuffer.h>
#include <swrast_setup/swrast_setup.h> #include <swrast_setup/swrast_setup.h>
#include <tnl/t_context.h>
#include <tnl/t_pipeline.h> #include <tnl/t_pipeline.h>
#include <tnl/tnl.h> #include <tnl/tnl.h>
#include <drivers/common/driverfuncs.h> #include <drivers/common/driverfuncs.h>
#include <drivers/common/meta.h> #include <drivers/common/meta.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(opengl32); WINE_DEFAULT_DEBUG_CHANNEL(opengl32);
#define WIDTH_BYTES_ALIGN32(cx, bpp) ((((cx) * (bpp) + 31) & ~31) >> 3) #define WIDTH_BYTES_ALIGN32(cx, bpp) ((((cx) * (bpp) + 31) & ~31) >> 3)

View file

@ -9,7 +9,6 @@
#include <pseh/pseh2.h> #include <pseh/pseh2.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DEFAULT_DEBUG_CHANNEL(wgl);
static CRITICAL_SECTION dc_data_cs = {NULL, -1, 0, 0, 0, 0}; static CRITICAL_SECTION dc_data_cs = {NULL, -1, 0, 0, 0, 0};

View file

@ -21,7 +21,7 @@
#include "opengl32.h" #include "opengl32.h"
#include <math.h> #include <math.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DEFAULT_DEBUG_CHANNEL(wgl);
/*********************************************************************** /***********************************************************************