diff options
author | Kristian Høgsberg <krh@redhat.com> | 2008-03-08 20:02:22 -0500 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2008-03-08 20:02:22 -0500 |
commit | 53dc86363665b9b22f042c5d950b7de0ed02b4c8 (patch) | |
tree | 271c372db97264faaf93180559c30d5a3b027399 /src/glx/x11/glxcmds.c | |
parent | a1ea6f6198d80f716936a308cfab235f18a014e1 (diff) |
Move DRI specific parts of CreateContext into dri_glx.c.
Diffstat (limited to 'src/glx/x11/glxcmds.c')
-rw-r--r-- | src/glx/x11/glxcmds.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c index d194301dd7..e8cb7b96f5 100644 --- a/src/glx/x11/glxcmds.c +++ b/src/glx/x11/glxcmds.c @@ -378,8 +378,6 @@ CreateContext(Display *dpy, XVisualInfo *vis, int screen = (fbconfig == NULL) ? vis->screen : fbconfig->screen; __GLXscreenConfigs * const psc = GetGLXScreenConfigs(dpy, screen); const __GLcontextModes * mode; - drm_context_t hwContext; - if (fbconfig == NULL) { mode = _gl_context_modes_find_visual(psc->visuals, vis->visualid); @@ -400,33 +398,7 @@ CreateContext(Display *dpy, XVisualInfo *vis, mode = fbconfig; } - if (psc && psc->driScreen.private) { - __DRIcontext *shared = (shareList != NULL) - ? &shareList->driContext : NULL; - - - if (!XF86DRICreateContextWithConfig(dpy, psc->scr, - mode->visualID, - &gc->hwContextID, &hwContext)) - /* gah, handle this better */ - return NULL; - - gc->driContext.private = - (*psc->driScreen.createNewContext)( &psc->driScreen, - mode, renderType, - shared, - hwContext, - &gc->driContext ); - if (gc->driContext.private) { - gc->isDirect = GL_TRUE; - gc->screen = mode->screen; - gc->psc = psc; - gc->mode = mode; - } - else { - XF86DRIDestroyContext(dpy, psc->scr, gc->hwContextID); - } - } + psc->driCreateContext(psc, mode, gc, shareList, renderType); } #endif |