summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorJon Taylor <taylorj@ggi-project.org>2000-10-28 10:02:44 +0000
committerJon Taylor <taylorj@ggi-project.org>2000-10-28 10:02:44 +0000
commit1aa958bc9cbca2d2274124d131968b51ee72d7ed (patch)
treeb420fa67dd3384eec1a704fe40cbf07b7e7ac6c8 /src/mesa
parent1c4b3f4dfbd71dfd0d414ecad1499bf44d31a919 (diff)
Lots of misc. bugfixes to bring GGIMesa in sync with the latest Mesa sources.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/ggi/default/stubs.c2
-rw-r--r--src/mesa/drivers/ggi/display/fbdev_mode.c6
-rw-r--r--src/mesa/drivers/ggi/ggimesa.c4
-rw-r--r--src/mesa/drivers/ggi/include/ggi/mesa/display_fbdev.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/ggi/default/stubs.c b/src/mesa/drivers/ggi/default/stubs.c
index f377532efd..f9df294ee4 100644
--- a/src/mesa/drivers/ggi/default/stubs.c
+++ b/src/mesa/drivers/ggi/default/stubs.c
@@ -389,7 +389,7 @@ triangle_func ggiGetTriangleFunc(GLcontext *ctx)
if (ctx->Stencil.Enabled) return NULL;
if (ctx->Polygon.SmoothFlag) return NULL;
if (ctx->Polygon.StippleFlag) return NULL;
- if (ctx->Texture.Enabled) return NULL;
+ if (ctx->Texture.ReallyEnabled) return NULL;
if (ctx->Light.ShadeModel==GL_SMOOTH) return NULL;
if (ctx->Depth.Test && ctx->Depth.Func != GL_LESS) return NULL;
diff --git a/src/mesa/drivers/ggi/display/fbdev_mode.c b/src/mesa/drivers/ggi/display/fbdev_mode.c
index f7f8f0b7fe..8aa8d91ef1 100644
--- a/src/mesa/drivers/ggi/display/fbdev_mode.c
+++ b/src/mesa/drivers/ggi/display/fbdev_mode.c
@@ -1,4 +1,4 @@
-/* $Id: fbdev_mode.c,v 1.4 2000/01/07 08:34:44 jtaylor Exp $
+/* $Id: fbdev_mode.c,v 1.5 2000/10/28 10:02:44 jtaylor Exp $
******************************************************************************
display-fbdev-mesa
@@ -80,7 +80,7 @@ static int do_setmode(ggi_visual *vis)
priv->have_accel = 0;
for (id = 1; GGIMesa_fbdev_getapi(vis, id, libname, libargs) == 0; id++)
{
- if (_ggiOpenDL(vis, libname, libargs, NULL) == NULL)
+ if (_ggiOpenDL(vis, libname, libargs, NULL) == 0)
{
fprintf(stderr, "display-fbdev-mesa: Error opening the "
"%s (%s) library.\n", libname, libargs);
@@ -91,7 +91,7 @@ static int do_setmode(ggi_visual *vis)
}
if (priv->oldpriv->accel &&
- _ggiOpenDL(vis, priv->accel, NULL, NULL) != NULL) {
+ _ggiOpenDL(vis, priv->accel, NULL, NULL) != 0) {
priv->have_accel = 1;
}
else
diff --git a/src/mesa/drivers/ggi/ggimesa.c b/src/mesa/drivers/ggi/ggimesa.c
index 2311959f5f..97c7780a18 100644
--- a/src/mesa/drivers/ggi/ggimesa.c
+++ b/src/mesa/drivers/ggi/ggimesa.c
@@ -370,7 +370,7 @@ int GGIMesaSetVisual(GGIMesaContext ctx, ggi_visual_t vis,
_mesa_destroy_visual(ctx->gl_vis);
if (ctx->gl_buffer)
- gl_destroy_framebuffer(ctx->gl_buffer);
+ _mesa_destroy_framebuffer(ctx->gl_buffer);
info.rgb_flag = rgb_flag;
info.db_flag = db_flag;
@@ -459,7 +459,7 @@ int GGIMesaSetVisual(GGIMesaContext ctx, ggi_visual_t vis,
ctx->lfb[1] = malloc(ctx->stride * ctx->height);
ctx->bufsize = (ctx->stride * ctx->height);
- ctx->gl_ctx->Visual = ctx->gl_vis;
+ ctx->gl_ctx->Visual = *ctx->gl_vis;
ctx->gl_ctx->Pixel.ReadBuffer =
ctx->gl_ctx->Color.DrawBuffer = (db_flag) ? GL_BACK : GL_FRONT;
diff --git a/src/mesa/drivers/ggi/include/ggi/mesa/display_fbdev.h b/src/mesa/drivers/ggi/include/ggi/mesa/display_fbdev.h
index 2ee51d1735..5c3c1e290c 100644
--- a/src/mesa/drivers/ggi/include/ggi/mesa/display_fbdev.h
+++ b/src/mesa/drivers/ggi/include/ggi/mesa/display_fbdev.h
@@ -14,7 +14,7 @@ struct fbdev_priv_mesa
char *accel;
int have_accel;
void *accelpriv;
- fbdev_hook *oldpriv; /* Hooks back to the LibGGI fbdev target's private data */
+ ggi_fbdev_priv *oldpriv; /* Hooks back to the LibGGI fbdev target's private data */
};
#endif /* _GGIMESA_DISPLAY_FBDEV_H */