diff options
| author | Keith Whitwell <[email protected]> | 2001-01-08 04:06:20 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2001-01-08 04:06:20 +0000 |
| commit | e9bf776711b22ce336cd462adf534ad3e2d61eec (patch) | |
| tree | 6ab4e1d24947ffca108d1ada9710bb9563e93011 /src/mesa/drivers/x11/xm_dd.c | |
| parent | 78477947de9c8a69bd4beec2ef24abd0d142d080 (diff) | |
Modify X11 driver and fake glx to store a GLcontext
(ie a 'struct __GLcontextRec *') instead of an 'XMesaContext'.
This is to fix conflicts in XFree86 where both the indirect XMesaContext
and the GLcontext were calling themselves __GLcontextRec's.
Diffstat (limited to 'src/mesa/drivers/x11/xm_dd.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_dd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index 50700c66280..21fe98cb493 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -1,8 +1,8 @@ -/* $Id: xm_dd.c,v 1.8 2000/12/26 05:09:31 keithw Exp $ */ +/* $Id: xm_dd.c,v 1.9 2001/01/08 04:06:20 keithw Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 + * Version: 3.5 * * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. * @@ -923,6 +923,7 @@ void xmesa_init_pointers( GLcontext *ctx ) ctx->Driver.Finish = finish; ctx->Driver.RenderStart = 0; + ctx->Driver.RenderPrimitive = _swsetup_RenderPrimNoop; ctx->Driver.RenderFinish = _swrast_flush; ctx->Driver.SetDrawBuffer = set_draw_buffer; |