diff options
| -rw-r--r-- | src/glx/create_context.c | 39 | ||||
| -rw-r--r-- | src/glx/dri2_glx.c | 1 | ||||
| -rw-r--r-- | src/glx/dri3_glx.c | 1 | ||||
| -rw-r--r-- | src/glx/drisw_glx.c | 1 | ||||
| -rw-r--r-- | src/glx/glxextensions.c | 1 | ||||
| -rw-r--r-- | src/glx/glxextensions.h | 1 |
6 files changed, 13 insertions, 31 deletions
diff --git a/src/glx/create_context.c b/src/glx/create_context.c index eab6511ad87..38e949ab4cd 100644 --- a/src/glx/create_context.c +++ b/src/glx/create_context.c @@ -47,41 +47,28 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config, xcb_generic_error_t *err; xcb_void_cookie_t cookie; unsigned dummy_err = 0; - int screen = -1; - if (dpy == NULL) - return NULL; - - /* Count the number of attributes specified by the application. All - * attributes appear in pairs, except the terminating None. - */ - if (attrib_list != NULL) { - for (/* empty */; attrib_list[num_attribs * 2] != 0; num_attribs++) - /* empty */ ; - } - if (cfg) { - screen = cfg->screen; - } else { - int i; - for (i = 0; i < num_attribs; i++) { - if (attrib_list[i * 2] == GLX_SCREEN) - screen = attrib_list[i * 2 + 1]; - } - } + if (dpy == NULL || cfg == NULL) + return NULL; /* This means that either the caller passed the wrong display pointer or * one of the internal GLX data structures (probably the fbconfig) has an * error. There is nothing sensible to do, so return an error. */ - psc = GetGLXScreenConfigs(dpy, screen); + psc = GetGLXScreenConfigs(dpy, cfg->screen); if (psc == NULL) return NULL; - assert(screen == psc->scr); + assert(cfg->screen == psc->scr); - if (!cfg && !__glXExtensionBitIsEnabled(psc, EXT_no_config_context_bit)) - return NULL; + /* Count the number of attributes specified by the application. All + * attributes appear in pairs, except the terminating None. + */ + if (attrib_list != NULL) { + for (/* empty */; attrib_list[num_attribs * 2] != 0; num_attribs++) + /* empty */ ; + } if (direct && psc->vtable->create_context_attribs) { /* GLX drops the error returned by the driver. The expectation is that @@ -117,8 +104,8 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config, cookie = xcb_glx_create_context_attribs_arb_checked(c, gc->xid, - cfg ? cfg->fbconfigID : 0, - screen, + cfg->fbconfigID, + cfg->screen, gc->share_xid, gc->isDirect, num_attribs, diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index eeec4f0d603..0f44635725d 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -1129,7 +1129,6 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv, __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context"); __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context_profile"); - __glXEnableDirectExtension(&psc->base, "GLX_EXT_no_config_context"); if ((mask & ((1 << __DRI_API_GLES) | (1 << __DRI_API_GLES2) | diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index 4470d1ef68d..fa048f990a9 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -719,7 +719,6 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv, __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context"); __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context_profile"); - __glXEnableDirectExtension(&psc->base, "GLX_EXT_no_config_context"); if ((mask & ((1 << __DRI_API_GLES) | (1 << __DRI_API_GLES2) | diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index 1f86ac2d4c0..2f0675addb4 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -630,7 +630,6 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions) if (psc->swrast->base.version >= 3) { __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context"); __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context_profile"); - __glXEnableDirectExtension(&psc->base, "GLX_EXT_no_config_context"); /* DRISW version >= 2 implies support for OpenGL ES. */ diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c index 4853ad534e2..af6ffbf6600 100644 --- a/src/glx/glxextensions.c +++ b/src/glx/glxextensions.c @@ -146,7 +146,6 @@ static const struct extension_info known_glx_extensions[] = { { GLX(EXT_fbconfig_packed_float), VER(0,0), Y, Y, N, N }, { GLX(EXT_framebuffer_sRGB), VER(0,0), Y, Y, N, N }, { GLX(EXT_import_context), VER(0,0), Y, Y, N, N }, - { GLX(EXT_no_config_context), VER(0,0), Y, N, N, N }, { GLX(EXT_texture_from_pixmap), VER(0,0), Y, N, N, N }, { GLX(EXT_visual_info), VER(0,0), Y, Y, N, N }, { GLX(EXT_visual_rating), VER(0,0), Y, Y, N, N }, diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h index 07cd3af0ff7..d73128bd0ea 100644 --- a/src/glx/glxextensions.h +++ b/src/glx/glxextensions.h @@ -50,7 +50,6 @@ enum EXT_fbconfig_packed_float_bit, EXT_framebuffer_sRGB_bit, EXT_import_context_bit, - EXT_no_config_context_bit, EXT_texture_from_pixmap_bit, EXT_visual_info_bit, EXT_visual_rating_bit, |