AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apple: More fixes for compilation failures

Browse Source 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston
2011-06-06 11:15:32 -04:00
parent f4537f99cc
commit 7c5f37c032
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glx/applegl_glx.c
+6 -6
View File
@@ -52,7 +52,7 @@ applegl_bind_context(struct glx_context *gc, struct glx_context *old,
{
Display *dpy = gc->psc->dpy;
bool error = apple_glx_make_current_context(dpy,
(oldGC && oldGC != &dummyContext) ? oldGC->driContext : NULL
(old && old != &dummyContext) ? old->driContext : NULL,
gc ? gc->driContext : NULL, draw);
apple_glx_diagnostic("%s: error %s\n", __func__, error ? "YES" : "NO");
@@ -93,7 +93,7 @@ static const struct glx_context_vtable applegl_context_vtable = {
struct glx_context *
applegl_create_context(struct glx_screen *psc,
struct glx_config *mode,
struct glx_config *config,
struct glx_context *shareList, int renderType)
{
struct glx_context *gc;
@@ -108,7 +108,7 @@ applegl_create_context(struct glx_screen *psc,
if (gc == NULL)
return NULL;
if (!glx_context_init(gc, psc, mode)) {
if (!glx_context_init(gc, psc, config)) {
Xfree(gc);
return NULL;
}
@@ -120,7 +120,7 @@ applegl_create_context(struct glx_screen *psc,
gc->do_destroy = False;
/* TODO: darwin: Integrate with above to do indirect */
if(apple_glx_create_context(&gc->driContext, dpy, screen, fbconfig,
if(apple_glx_create_context(&gc->driContext, dpy, screen, config,
shareList ? shareList->driContext : NULL,
&errorcode, &x11error)) {
__glXSendError(dpy, errorcode, 0, X_GLXCreateContext, x11error);
@@ -129,8 +129,8 @@ applegl_create_context(struct glx_screen *psc,
}
gc->currentContextTag = -1;
gc->mode = fbconfig;
gc->isDirect = 1;
gc->config = config;
gc->isDirect = GL_TRUE;
gc->xid = 1; /* Just something not None, so we know when to destroy
* it in MakeContextCurrent. */