OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lots of misc. bugfixes to bring GGIMesa in sync with the latest Mesa sources.

Browse Source
This commit is contained in:
Jon Taylor
2000-10-28 10:02:44 +00:00
parent 1c4b3f4dfb
commit 1aa958bc9c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/ggi/default/stubs.c
View File

@@ -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;

6
src/mesa/drivers/ggi/display/fbdev_mode.c
View File

@@ -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

4
src/mesa/drivers/ggi/ggimesa.c
View File

@@ -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;

2
src/mesa/drivers/ggi/include/ggi/mesa/display_fbdev.h
View File

@@ -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 */