First batch of OpenGL SI related changes:

Renamed struct gl_context to struct __GLcontextRec.
Include glcore.h, setup GL imports/exports.
Replaced gl_ prefix with _mesa_ prefix in context.[ch] functions.
GLcontext's Visual field is no longer a pointer.

2 files changed, 37 insertions, 36 deletions

diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index 01fea7f5a02..b372469288c 100644
--- a/src/mesa/drivers/windows/wmesa.c
+++ b/src/mesa/drivers/windows/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.7 2000/09/12 15:46:43 brianp Exp $ */
+/* $Id: wmesa.c,v 1.8 2000/09/26 20:54:13 brianp Exp $ */
 
 /*
  * Windows (Win32) device driver for Mesa 3.4
@@ -1280,37 +1280,37 @@ WMesaContext WMesaCreateContext( HWND hWnd, HPALETTE* Pal,
 #endif
 
 
-    c->gl_visual = gl_create_visual(rgb_flag,
-                                    GL_FALSE,   /* software alpha */
-                                    db_flag,    /* db_flag */
-                                    GL_FALSE,   /* stereo */
-                                    16,         /* depth_bits */
-                                    8,          /* stencil_bits */
-                                    8,          /* accum_bits */
-                                    0,          /* index bits */
-                                    8,8,8,8 );  /* r, g, b, a bits */
+    c->gl_visual = _mesa_create_visual(rgb_flag,
+                                       db_flag,    /* db_flag */
+                                       GL_FALSE,   /* stereo */
+                                       8,8,8,8,    /* r, g, b, a bits */
+                                       0,          /* index bits */
+                                       16,         /* depth_bits */
+                                       8,          /* stencil_bits */
+                                       16,16,16,16,/* accum_bits */
+                                       1);
 
     if (!c->gl_visual) {
         return NULL;
     }
 
     /* allocate a new Mesa context */
-    c->gl_ctx = gl_create_context( c->gl_visual, NULL, c, GL_TRUE);
+    c->gl_ctx = _mesa_create_context( c->gl_visual, NULL, c, GL_TRUE);
 
     if (!c->gl_ctx) {
-        gl_destroy_visual( c->gl_visual );
+        _mesa_destroy_visual( c->gl_visual );
         free(c);
         return NULL;
     }
 
-    c->gl_buffer = gl_create_framebuffer( c->gl_visual,
+    c->gl_buffer = _mesa_create_framebuffer( c->gl_visual,
                                           c->gl_visual->DepthBits > 0,
                                           c->gl_visual->StencilBits > 0,
                                           c->gl_visual->AccumRedBits > 0,
                                           c->gl_visual->AlphaBits > 0 );
     if (!c->gl_buffer) {
-        gl_destroy_visual( c->gl_visual );
-        gl_destroy_context( c->gl_ctx );
+        _mesa_destroy_visual( c->gl_visual );
+        _mesa_destroy_context( c->gl_ctx );
         free(c);
         return NULL;
     }
@@ -1329,9 +1329,9 @@ void WMesaDestroyContext( void )
     WC = c;
     if(c->hPalHalfTone != NULL)
         DeleteObject(c->hPalHalfTone);
-    gl_destroy_visual( c->gl_visual );
-    gl_destroy_framebuffer( c->gl_buffer );
-    gl_destroy_context( c->gl_ctx );
+    _mesa_destroy_visual( c->gl_visual );
+    _mesa_destroy_framebuffer( c->gl_buffer );
+    _mesa_destroy_context( c->gl_ctx );
 
     if (c->db_flag)
 #ifdef DDRAW
@@ -1367,7 +1367,7 @@ void /*APIENTRY*/ WMesaMakeCurrent( WMesaContext c )
         return;
 
     //gl_set_context( c->gl_ctx );
-    gl_make_current(c->gl_ctx, c->gl_buffer);
+    _mesa_make_current(c->gl_ctx, c->gl_buffer);
     setup_DD_pointers(c->gl_ctx);
     Current = c;
     if (Current->gl_ctx->Viewport.Width==0) {
diff --git a/src/mesa/drivers/windows/wmesa_stereo.c b/src/mesa/drivers/windows/wmesa_stereo.c
index 934e6a5f832..3408fe943c8 100644
--- a/src/mesa/drivers/windows/wmesa_stereo.c
+++ b/src/mesa/drivers/windows/wmesa_stereo.c
@@ -1181,32 +1181,33 @@ WMesaContext /*APIENTRY*/ WMesaCreateContext( HWND hWnd, HPALETTE Pal,
 

 

 

-  c->gl_visual = gl_create_visual(rgb_flag,

-								  GL_FALSE,	/* software alpha */

-                                  db_flag,	/* db_flag */

-                                  16,		/* depth_bits */

-                                  8,		/* stencil_bits */

-                                  8,		/* accum_bits */

-                                  8,

-                                  255.0, 255.0, 255.0, 255.0 );

+  c->gl_visual = _mesa_create_visual(rgb_flag,

+                                     db_flag,	/* db_flag */

+                                     GL_TRUE,   /* stereo */

+                                     8, 8, 8, 8,/* rgba bits */

+                                     0,         /* index bits */

+                                     16,	/* depth_bits */

+                                     8,		/* stencil_bits */

+                                     16,16,16,16,/* accum_bits */

+                                     1 );

 

 	if (!c->gl_visual) {

          return NULL;

       }

 

   /* allocate a new Mesa context */

-  c->gl_ctx = gl_create_context( c->gl_visual, NULL,c);

+  c->gl_ctx = _mesa_create_context( c->gl_visual, NULL,c);

 

   if (!c->gl_ctx) {

-         gl_destroy_visual( c->gl_visual );

+         _mesa_destroy_visual( c->gl_visual );

          free(c);

          return NULL;

       }

 

-      c->gl_buffer = gl_create_framebuffer( c->gl_visual );

+      c->gl_buffer = _mesa_create_framebuffer( c->gl_visual );

       if (!c->gl_buffer) {

-         gl_destroy_visual( c->gl_visual );

-         gl_destroy_context( c->gl_ctx );

+         _mesa_destroy_visual( c->gl_visual );

+         _mesa_destroy_context( c->gl_ctx );

          free(c);

          return NULL;

       }

@@ -1223,9 +1224,9 @@ void /*APIENTRY*/ WMesaDestroyContext( void )
 	ReleaseDC(c->Window,c->hDC);

 	WC = c;

 

-    gl_destroy_visual( c->gl_visual );

-    gl_destroy_framebuffer( c->gl_buffer );

-	gl_destroy_context( c->gl_ctx );

+    _mesa_destroy_visual( c->gl_visual );

+    _mesa_destroy_framebuffer( c->gl_buffer );

+    _mesa_destroy_context( c->gl_ctx );

 

 	if (c->db_flag){

 		wmDeleteBackingStore(c);

@@ -1267,7 +1268,7 @@ void /*APIENTRY*/ WMesaMakeCurrent( WMesaContext c )
 		return;

 

 	//gl_set_context( c->gl_ctx );

-	gl_make_current(c->gl_ctx, c->gl_buffer);

+	_mesa_make_current(c->gl_ctx, c->gl_buffer);

 	Current = c;

 	setup_DD_pointers(c->gl_ctx);

 	if (Current->gl_ctx->Viewport.Width==0) {