1 files changed, 28 insertions, 13 deletions
diff --git a/src/mesa/drivers/windows/gdi/wmesadef.h b/src/mesa/drivers/windows/gdi/wmesadef.h
index 8b2f4912d6c..296000a12f7 100644
--- a/src/mesa/drivers/windows/gdi/wmesadef.h
+++ b/src/mesa/drivers/windows/gdi/wmesadef.h
@@ -1,27 +1,28 @@
+#ifndef WMESADEF_H
+#define WMESADEF_H
 
 #include "context.h"
 
-typedef struct _dibSection{
+typedef struct _dibSection {
     HDC		hDC;
     HANDLE	hFileMap;
     BOOL	fFlushed;
     LPVOID	base;
-}WMDIBSECTION, *PWMDIBSECTION;
+} WMDIBSECTION, *PWMDIBSECTION;
 
-typedef struct wmesa_context{
-    GLcontext           *gl_ctx;	/* The core GL/Mesa context */
-    GLvisual            *gl_visual;	/* Describes the buffers */
-    GLframebuffer       *gl_buffer;	/* Depth, stencil, accum, etc buffers*/
+/**
+ * The Windows Mesa rendering context, derived from GLcontext.
+ */
+struct wmesa_context {
+    GLcontext           gl_ctx;	        /* The core GL/Mesa context */
     HDC                 hDC;
     COLORREF		clearColorRef;
     HPEN                clearPen;
     HBRUSH              clearBrush;
-    GLuint		width;
-    GLuint		height;
-    GLuint		ScanWidth;
-    GLboolean		rgb_flag;
-    GLboolean		db_flag;
-    GLboolean		alpha_flag;
+    GLuint		ScanWidth; /* XXX move into wmesa_framebuffer */
+    GLboolean		rgb_flag; /* XXX remove - use gl_visual field */
+    GLboolean		db_flag; /* XXX remove - use gl_visual field */
+    GLboolean		alpha_flag; /* XXX remove - use gl_visual field */
     WMDIBSECTION	dib;
     BITMAPINFO          bmi;
     HBITMAP             hbmDIB;
@@ -29,6 +30,20 @@ typedef struct wmesa_context{
     PBYTE               pbPixels;
     BYTE		cColorBits;
     int			pixelformat;
-}  *PWMC;
+};
 
 
+/**
+ * Windows framebuffer, derived from gl_framebuffer
+ */
+struct wmesa_framebuffer
+{
+    struct gl_framebuffer Base;
+    HDC hdc;
+    struct wmesa_framebuffer *next;
+};
+
+typedef struct wmesa_framebuffer *WMesaFramebuffer;
+
+
+#endif /* WMESADEF_H */