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

glx: Convert tab to space in applegl_glx.c 

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17784>
This commit is contained in:
Yonggang Luo 2022-07-28 13:37:18 +08:00 committed by Marge Bot
parent 73c51b5c57
commit 9caa6bb71a
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/glx/applegl_glx.c
View File

@ -49,13 +49,15 @@ applegl_destroy_context(struct glx_context *gc)
} }
static int static int
applegl_bind_context(struct glx_context *gc, struct glx_context *old, applegl_bind_context(
GLXDrawable draw, GLXDrawable read) struct glx_context *gc, struct glx_context *old,
GLXDrawable draw, GLXDrawable read)
{ {
Display *dpy = gc->psc->dpy; Display *dpy = gc->psc->dpy;
bool error = apple_glx_make_current_context(dpy, bool error = apple_glx_make_current_context(
(old && old != &dummyContext) ? old->driContext : NULL, dpy,
gc ? gc->driContext : NULL, draw); (old && old != &dummyContext) ? old->driContext : NULL,
gc ? gc->driContext : NULL, draw);
apple_glx_diagnostic("%s: error %s\n", __func__, error ? "YES" : "NO"); apple_glx_diagnostic("%s: error %s\n", __func__, error ? "YES" : "NO");
if (error) if (error)
@ -82,9 +84,10 @@ applegl_unbind_context(struct glx_context *gc, struct glx_context *new)
dpy = gc->psc->dpy; dpy = gc->psc->dpy;
error = apple_glx_make_current_context(dpy, error = apple_glx_make_current_context(
(gc != &dummyContext) ? gc->driContext : NULL, dpy,
NULL, None); (gc != &dummyContext) ? gc->driContext : NULL,
NULL, None);
apple_glx_diagnostic("%s: error %s\n", __func__, error ? "YES" : "NO"); apple_glx_diagnostic("%s: error %s\n", __func__, error ? "YES" : "NO");
} }
@ -117,9 +120,10 @@ static const struct glx_context_vtable applegl_context_vtable = {
}; };
struct glx_context * struct glx_context *
applegl_create_context(struct glx_screen *psc, applegl_create_context(
struct glx_config *config, struct glx_screen *psc,
struct glx_context *shareList, int renderType) struct glx_config *config,
struct glx_context *shareList, int renderType)
{ {
struct glx_context *gc; struct glx_context *gc;
int errorcode; int errorcode;
@ -146,9 +150,9 @@ applegl_create_context(struct glx_screen *psc,
gc->driContext = NULL; gc->driContext = NULL;
/* TODO: darwin: Integrate with above to do indirect */ /* TODO: darwin: Integrate with above to do indirect */
if(apple_glx_create_context(&gc->driContext, dpy, screen, config, if (apple_glx_create_context(&gc->driContext, dpy, screen, config,
shareList ? shareList->driContext : NULL, shareList ? shareList->driContext : NULL,
&errorcode, &x11error)) { &errorcode, &x11error)) {
__glXSendError(dpy, errorcode, 0, X_GLXCreateContext, x11error); __glXSendError(dpy, errorcode, 0, X_GLXCreateContext, x11error);
gc->vtable->destroy(gc); gc->vtable->destroy(gc);
return NULL; return NULL;
@ -158,7 +162,7 @@ applegl_create_context(struct glx_screen *psc,
gc->config = config; gc->config = config;
gc->isDirect = GL_TRUE; gc->isDirect = GL_TRUE;
gc->xid = 1; /* Just something not None, so we know when to destroy gc->xid = 1; /* Just something not None, so we know when to destroy
* it in MakeContextCurrent. */ * it in MakeContextCurrent. */
return gc; return gc;
} }