From b1394fa92aaaf859ce9efc8b5fc194397921320c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 26 Sep 2000 20:53:53 +0000 Subject: 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. --- src/mesa/drivers/x11/xm_api.c | 52 +++++++++++++++++++++--------------------- src/mesa/drivers/x11/xm_line.c | 4 ++-- src/mesa/drivers/x11/xm_tri.c | 6 ++--- src/mesa/drivers/x11/xmesaP.h | 4 ++-- 4 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/mesa/drivers/x11') diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index 88650d675a..5b31b8f790 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -1,4 +1,4 @@ -/* $Id: xm_api.c,v 1.1 2000/09/07 15:40:30 brianp Exp $ */ +/* $Id: xm_api.c,v 1.2 2000/09/26 20:54:13 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1629,7 +1629,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list ) return NULL; } - c->gl_ctx = gl_create_context( v->gl_visual, + c->gl_ctx = _mesa_create_context( v->gl_visual, share_list ? share_list->gl_ctx : (GLcontext *) NULL, (void *) c, direct ); if (!c->gl_ctx) { @@ -1660,7 +1660,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list ) #endif /* Run the config file */ - gl_context_initialize( c->gl_ctx ); + _mesa_context_initialize( c->gl_ctx ); return c; } @@ -1675,7 +1675,7 @@ void XMesaDestroyContext( XMesaContext c ) fxMesaDestroyContext(c->xm_buffer->FXctx); #endif if (c->gl_ctx) - gl_destroy_context( c->gl_ctx ); + _mesa_destroy_context( c->gl_ctx ); /* Disassociate old buffer with this context */ if (c->xm_buffer) @@ -1787,11 +1787,11 @@ XMesaBuffer XMesaCreateWindowBuffer2( XMesaVisual v, XMesaWindow w, b->db_state = 0; } - b->gl_buffer = gl_create_framebuffer( v->gl_visual, - v->gl_visual->DepthBits > 0, - v->gl_visual->StencilBits > 0, - v->gl_visual->AccumRedBits > 0, - v->gl_visual->AlphaBits > 0 ); + b->gl_buffer = _mesa_create_framebuffer( v->gl_visual, + v->gl_visual->DepthBits > 0, + v->gl_visual->StencilBits > 0, + v->gl_visual->AccumRedBits > 0, + v->gl_visual->AlphaBits > 0 ); if (!b->gl_buffer) { free_xmesa_buffer(client, b); return NULL; @@ -1799,7 +1799,7 @@ XMesaBuffer XMesaCreateWindowBuffer2( XMesaVisual v, XMesaWindow w, if (!initialize_visual_and_buffer( client, v, b, v->gl_visual->RGBAflag, (XMesaDrawable)w, b->cmap )) { - gl_destroy_framebuffer( b->gl_buffer ); + _mesa_destroy_framebuffer( b->gl_buffer ); free_xmesa_buffer(client, b); return NULL; } @@ -1929,13 +1929,13 @@ XMesaBuffer XMesaCreatePixmapBuffer( XMesaVisual v, b->db_state = 0; } - b->gl_buffer = gl_create_framebuffer( v->gl_visual, - v->gl_visual->DepthBits > 0, - v->gl_visual->StencilBits > 0, - v->gl_visual->AccumRedBits + - v->gl_visual->AccumGreenBits + - v->gl_visual->AccumBlueBits > 0, - v->gl_visual->AlphaBits > 0 ); + b->gl_buffer = _mesa_create_framebuffer( v->gl_visual, + v->gl_visual->DepthBits > 0, + v->gl_visual->StencilBits > 0, + v->gl_visual->AccumRedBits + + v->gl_visual->AccumGreenBits + + v->gl_visual->AccumBlueBits > 0, + v->gl_visual->AlphaBits > 0 ); if (!b->gl_buffer) { free_xmesa_buffer(client, b); return NULL; @@ -1943,7 +1943,7 @@ XMesaBuffer XMesaCreatePixmapBuffer( XMesaVisual v, if (!initialize_visual_and_buffer(client, v, b, v->gl_visual->RGBAflag, (XMesaDrawable)p, cmap)) { - gl_destroy_framebuffer( b->gl_buffer ); + _mesa_destroy_framebuffer( b->gl_buffer ); free_xmesa_buffer(client, b); return NULL; } @@ -2001,7 +2001,7 @@ void XMesaDestroyBuffer( XMesaBuffer b ) if (b->xm_context) b->xm_context->xm_buffer = NULL; - gl_destroy_framebuffer( b->gl_buffer ); + _mesa_destroy_framebuffer( b->gl_buffer ); free_xmesa_buffer(client, b); } @@ -2044,7 +2044,7 @@ GLboolean XMesaMakeCurrent2( XMesaContext c, XMesaBuffer drawBuffer, return GL_TRUE; } #endif - if (c->gl_ctx == gl_get_current_context() + if (c->gl_ctx == _mesa_get_current_context() && c->xm_buffer == drawBuffer && c->xm_read_buffer == readBuffer && c->xm_buffer->wasCurrent) { @@ -2061,7 +2061,7 @@ GLboolean XMesaMakeCurrent2( XMesaContext c, XMesaBuffer drawBuffer, c->xm_read_buffer = readBuffer; c->use_read_buffer = (drawBuffer != readBuffer); - gl_make_current2(c->gl_ctx, drawBuffer->gl_buffer, readBuffer->gl_buffer); + _mesa_make_current2(c->gl_ctx, drawBuffer->gl_buffer, readBuffer->gl_buffer); if (c->gl_ctx->Viewport.Width == 0) { /* initialize viewport to window size */ @@ -2092,7 +2092,7 @@ GLboolean XMesaMakeCurrent2( XMesaContext c, XMesaBuffer drawBuffer, } else { /* Detach */ - gl_make_current2( NULL, NULL, NULL ); + _mesa_make_current2( NULL, NULL, NULL ); } return GL_TRUE; } @@ -2151,12 +2151,12 @@ XMesaBuffer XMesaGetCurrentReadBuffer( void ) GLboolean XMesaForceCurrent(XMesaContext c) { if (c) { - if (c->gl_ctx != gl_get_current_context()) { - gl_make_current(c->gl_ctx, c->xm_buffer->gl_buffer); + if (c->gl_ctx != _mesa_get_current_context()) { + _mesa_make_current(c->gl_ctx, c->xm_buffer->gl_buffer); } } else { - gl_make_current(NULL, NULL); + _mesa_make_current(NULL, NULL); } return GL_TRUE; } @@ -2165,7 +2165,7 @@ GLboolean XMesaForceCurrent(XMesaContext c) GLboolean XMesaLoseCurrent(XMesaContext c) { (void) c; - gl_make_current(NULL, NULL); + _mesa_make_current(NULL, NULL); return GL_TRUE; } diff --git a/src/mesa/drivers/x11/xm_line.c b/src/mesa/drivers/x11/xm_line.c index 86b85eccba..03af57b3bf 100644 --- a/src/mesa/drivers/x11/xm_line.c +++ b/src/mesa/drivers/x11/xm_line.c @@ -1,4 +1,4 @@ -/* $Id: xm_line.c,v 1.2 2000/09/12 17:03:59 brianp Exp $ */ +/* $Id: xm_line.c,v 1.3 2000/09/26 20:54:13 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -683,7 +683,7 @@ line_func xmesa_get_line_func( GLcontext *ctx ) && ctx->RasterMask==DEPTH_BIT && ctx->Depth.Func==GL_LESS && ctx->Depth.Mask==GL_TRUE - && ctx->Visual->DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS + && ctx->Visual.DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS && ctx->Line.Width==1.0F) { switch (xmesa->pixelformat) { case PF_TRUECOLOR: diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c index 870a257573..29b97a03b0 100644 --- a/src/mesa/drivers/x11/xm_tri.c +++ b/src/mesa/drivers/x11/xm_tri.c @@ -1,4 +1,4 @@ -/* $Id: xm_tri.c,v 1.2 2000/09/12 17:03:59 brianp Exp $ */ +/* $Id: xm_tri.c,v 1.3 2000/09/26 20:54:13 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1548,7 +1548,7 @@ triangle_func xmesa_get_triangle_func( GLcontext *ctx ) && ctx->RasterMask==DEPTH_BIT && ctx->Depth.Func==GL_LESS && ctx->Depth.Mask==GL_TRUE - && ctx->Visual->DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS + && ctx->Visual.DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS && ctx->Polygon.StippleFlag==GL_FALSE) { switch (xmesa->pixelformat) { case PF_TRUECOLOR: @@ -1580,7 +1580,7 @@ triangle_func xmesa_get_triangle_func( GLcontext *ctx ) && ctx->RasterMask==DEPTH_BIT && ctx->Depth.Func==GL_LESS && ctx->Depth.Mask==GL_TRUE - && ctx->Visual->DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS + && ctx->Visual.DepthBits == DEFAULT_SOFTWARE_DEPTH_BITS && ctx->Polygon.StippleFlag==GL_FALSE) { switch (xmesa->pixelformat) { case PF_TRUECOLOR: diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h index 9d311f21f3..ebea73981f 100644 --- a/src/mesa/drivers/x11/xmesaP.h +++ b/src/mesa/drivers/x11/xmesaP.h @@ -1,4 +1,4 @@ -/* $Id: xmesaP.h,v 1.12 2000/09/07 15:42:38 brianp Exp $ */ +/* $Id: xmesaP.h,v 1.13 2000/09/26 20:54:13 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -127,7 +127,7 @@ struct xmesa_visual { /* - * "Derived" from gl_context. Basically corresponds to a GLXContext. + * "Derived" from __GLcontextRec. Basically corresponds to a GLXContext. */ struct xmesa_context { GLcontext *gl_ctx; /* the core library context */ -- cgit v1.2.3