Clean up data structures, finishing off some of the cleanup work suggested by Brian. Now also creating two renderbuffers, so apps can now switch with glDrawBuffer.

1 files changed, 10 insertions, 18 deletions

diff --git a/src/mesa/drivers/windows/gdi/wmesadef.h b/src/mesa/drivers/windows/gdi/wmesadef.h
index 296000a12f..97b063a8ba 100644
--- a/src/mesa/drivers/windows/gdi/wmesadef.h
+++ b/src/mesa/drivers/windows/gdi/wmesadef.h
@@ -3,12 +3,6 @@
 
 #include "context.h"
 
-typedef struct _dibSection {
-    HDC		hDC;
-    HANDLE	hFileMap;
-    BOOL	fFlushed;
-    LPVOID	base;
-} WMDIBSECTION, *PWMDIBSECTION;
 
 /**
  * The Windows Mesa rendering context, derived from GLcontext.
@@ -19,17 +13,6 @@ struct wmesa_context {
     COLORREF		clearColorRef;
     HPEN                clearPen;
     HBRUSH              clearBrush;
-    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;
-    HBITMAP             hOldBitmap;
-    PBYTE               pbPixels;
-    BYTE		cColorBits;
-    int			pixelformat;
 };
 
 
@@ -39,7 +22,16 @@ struct wmesa_context {
 struct wmesa_framebuffer
 {
     struct gl_framebuffer Base;
-    HDC hdc;
+    HDC                 hDC;
+    int			pixelformat;
+    GLuint		ScanWidth;
+    BYTE		cColorBits;
+    /* back buffer DIB fields */
+    HDC                 dib_hDC;
+    BITMAPINFO          bmi;
+    HBITMAP             hbmDIB;
+    HBITMAP             hOldBitmap;
+    PBYTE               pbPixels;
     struct wmesa_framebuffer *next;
 };