summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Schultz <[email protected]>2002-03-25 23:52:34 +0000
committerKarl Schultz <[email protected]>2002-03-25 23:52:34 +0000
commit4ad3511865b9ea36f0eeb57b33c7c440c21448a2 (patch)
tree92eb8ef195d60b8d6e4cb4f4ed381978eec6d400
parent44f6191507032918ab27bed7c7f5cf5b0fb45703 (diff)
(WIN32)Use _glapi_get_context to get the context in buffer_size() instead
of the GET_CURRENT_CONTEXT macro. The macro tries to use the glapi_Context variable which needs to be imported from the MesaGL DLL, which is too problematic to do at the moment.
-rw-r--r--src/mesa/drivers/osmesa/osmesa.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 34de8226ce4..b38267d1fda 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,4 +1,4 @@
-/* $Id: osmesa.c,v 1.71.2.3 2002/03/16 00:50:12 brianp Exp $ */
+/* $Id: osmesa.c,v 1.71.2.4 2002/03/25 23:52:34 kschultz Exp $ */
/*
* Mesa 3-D graphics library
@@ -878,7 +878,13 @@ static void clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
static void buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
{
+#ifdef WIN32
+ /* Hack to get around problems with exporting glapi_Context from MesaGL
+ and importing into OSMesa. */
+ GLcontext *ctx = (GLcontext *) _glapi_get_context();
+#else
GET_CURRENT_CONTEXT(ctx);
+#endif
(void) buffer;
if (ctx) {
OSMesaContext osmesa = OSMESA_CONTEXT(ctx);