Mesa (master): st/wgl: Include main/core.h.

[Chia-I Wu]

Module: Mesa
Branch: master
Commit: 59e6e765426a5877db7446e1e34bb7edd3dc1f74
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=59e6e765426a5877db7446e1e34bb7edd3dc1f74

Author: Chia-I Wu <olv at lunarg.com>
Date:   Mon Aug 23 17:31:27 2010 +0800

st/wgl: Include main/core.h.

Make st/wgl include only main/core.h from core mesa.

---

 src/gallium/state_trackers/wgl/stw_context.c     |    2 +-
 src/gallium/state_trackers/wgl/stw_device.c      |    2 +-
 src/gallium/state_trackers/wgl/stw_pixelformat.c |    4 +---
 src/gallium/state_trackers/wgl/stw_pixelformat.h |    2 --
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gallium/state_trackers/wgl/stw_context.c b/src/gallium/state_trackers/wgl/stw_context.c
index 0fb7cd8..a0e14b9 100644
--- a/src/gallium/state_trackers/wgl/stw_context.c
+++ b/src/gallium/state_trackers/wgl/stw_context.c
@@ -33,7 +33,7 @@
 
 /* for _mesa_share_state */
 #include "state_tracker/st_context.h"
-#include "main/context.h"
+#include "main/core.h"
 
 #include "stw_icd.h"
 #include "stw_device.h"
diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c
index a107c71..37809d0 100644
--- a/src/gallium/state_trackers/wgl/stw_device.c
+++ b/src/gallium/state_trackers/wgl/stw_device.c
@@ -27,7 +27,7 @@
 
 #include <windows.h>
 
-#include "glapi/glthread.h"
+#include "glapi/glapi.h"
 #include "util/u_debug.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/state_trackers/wgl/stw_pixelformat.c b/src/gallium/state_trackers/wgl/stw_pixelformat.c
index e606477..18ac482 100644
--- a/src/gallium/state_trackers/wgl/stw_pixelformat.c
+++ b/src/gallium/state_trackers/wgl/stw_pixelformat.c
@@ -25,15 +25,13 @@
  * 
  **************************************************************************/
 
-#include "main/mtypes.h"
-#include "main/context.h"
-
 #include "pipe/p_format.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
 
 #include "util/u_format.h"
 #include "util/u_debug.h"
+#include "util/u_memory.h"
 
 #include "stw_icd.h"
 #include "stw_device.h"
diff --git a/src/gallium/state_trackers/wgl/stw_pixelformat.h b/src/gallium/state_trackers/wgl/stw_pixelformat.h
index d405172..282c9f6 100644
--- a/src/gallium/state_trackers/wgl/stw_pixelformat.h
+++ b/src/gallium/state_trackers/wgl/stw_pixelformat.h
@@ -34,8 +34,6 @@
 #define PFD_SUPPORT_COMPOSITION 0x00008000
 #endif
 
-#include "main/mtypes.h"
-
 #include "pipe/p_compiler.h"
 #include "pipe/p_format.h"
 #include "state_tracker/st_api.h"