From: Daniel Borca <dborca@users.sourceforge.net>
Date: Mon, 9 May 2005 22:15:24 +0000 (+0000)
Subject: pathetic attempt to accomodate new frambuffer changes (still some work to do)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fee163a61ac42e7ea00c8c7e708e0e879cc10ab0;p=mesa.git

pathetic attempt to accomodate new frambuffer changes (still some work to do)
---

diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index e85a0f87300..e535e739b31 100644
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -43,6 +43,7 @@
 #include "fxdrv.h"
 
 #include "drivers/common/driverfuncs.h"
+#include "framebuffer.h"
 
 #ifndef TDFX_DEBUG
 int TDFX_DEBUG = (0
@@ -678,11 +679,17 @@ fxMesaCreateContext(GLuint win,
    }
 
 
-   fxMesa->glBuffer = _mesa_create_framebuffer(fxMesa->glVis,
+   fxMesa->glBuffer = _mesa_create_framebuffer(fxMesa->glVis);
+#if 0
+/* XXX this is a complete mess :(
+ *	_mesa_add_soft_renderbuffers
+ *	driNewRenderbuffer
+ */
 					       GL_FALSE,	/* no software depth */
 					       stencilSize && !fxMesa->haveHwStencil,
 					       fxMesa->glVis->accumRedBits > 0,
 					       alphaSize && !fxMesa->haveHwAlpha);
+#endif
    if (!fxMesa->glBuffer) {
       str = "_mesa_create_framebuffer";
       goto errorhandler;
@@ -838,7 +845,7 @@ void GLAPIENTRY
 fxMesaMakeCurrent(fxMesaContext fxMesa)
 {
    if (!fxMesa) {
-      _mesa_make_current(NULL, NULL);
+      _mesa_make_current(NULL, NULL, NULL);
       fxMesaCurrentCtx = NULL;
 
       if (TDFX_DEBUG & VERBOSE_DRIVER) {
@@ -870,7 +877,7 @@ fxMesaMakeCurrent(fxMesaContext fxMesa)
    grSstSelect(fxMesa->board);
    grGlideSetState((GrState *) fxMesa->state);
 
-   _mesa_make_current(fxMesa->glCtx, fxMesa->glBuffer);
+   _mesa_make_current(fxMesa->glCtx, fxMesa->glBuffer, fxMesa->glBuffer);
 
    fxSetupDDPointers(fxMesa->glCtx);
 }