From a14e3b43be17997ab67a362addddab44ac856869 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 26 Sep 2019 11:07:13 -0400 Subject: [PATCH] Revert "glx: Implement GLX_EXT_no_config_context" This reverts commit 0d635ccc912d7122f35f81eec27d8b2c0a2a7a28. Gitlab: https://gitlab.freedesktop.org/mesa/mesa/issues/1207 --- src/glx/applegl_glx.c | 3 -- src/glx/create_context.c | 49 +++++++---------------- src/glx/dri2_glx.c | 1 - src/glx/dri3_glx.c | 1 - src/glx/dri_common.c | 4 -- src/glx/drisw_glx.c | 1 - src/glx/driwindows_glx.c | 2 +- src/glx/g_glxglvnddispatchfuncs.c | 14 +------ src/glx/glxcmds.c | 5 +-- src/glx/glxextensions.c | 1 - src/glx/glxextensions.h | 1 - src/glx/tests/create_context_unittest.cpp | 9 +++++ 12 files changed, 26 insertions(+), 65 deletions(-) diff --git a/src/glx/applegl_glx.c b/src/glx/applegl_glx.c index 85f70058c64..c086e5146a8 100644 --- a/src/glx/applegl_glx.c +++ b/src/glx/applegl_glx.c @@ -134,9 +134,6 @@ applegl_create_context(struct glx_screen *psc, /* TODO: Integrate this with apple_glx_create_context and make * struct apple_glx_context inherit from struct glx_context. */ - if (!config) - return NULL; - gc = calloc(1, sizeof(*gc)); if (gc == NULL) return NULL; diff --git a/src/glx/create_context.c b/src/glx/create_context.c index fa15d551af0..38e949ab4cd 100644 --- a/src/glx/create_context.c +++ b/src/glx/create_context.c @@ -33,14 +33,6 @@ #error This code requires sizeof(uint32_t) == sizeof(int). #endif -/* debian stretch still has ancient headers and we're apparently still - * using that for gitlab ci. please delete me when that's fixed. - */ -#ifndef X_GLXCreateContextAttribsARB -#warning Please update your GLX protocol headers -#define X_GLXCreateContextAttribsARB 34 -#endif - _X_HIDDEN GLXContext glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, @@ -55,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 { - for (unsigned int i = 0; i < num_attribs; i++) { - if (attrib_list[i * 2] == GLX_SCREEN) - screen = attrib_list[i * 2 + 1]; - } - if (screen == -1) { - __glXSendError(dpy, BadValue, 0, X_GLXCreateContextAttribsARB, True); - return NULL; - } - } + 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); + + /* 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 @@ -125,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 f4a4a6ce408..bed25bb38d6 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -1135,7 +1135,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 805172bdd97..a5cf0e3bf32 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -750,7 +750,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/dri_common.c b/src/glx/dri_common.c index d70bff43eb4..a5fae27fce9 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -500,10 +500,6 @@ dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs, return false; } break; - case GLX_SCREEN: - /* Implies GLX_EXT_no_config_context */ - *render_type = GLX_DONT_CARE; - break; default: /* If an unknown attribute is received, fail. */ diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index f5544f8b4f0..f38dbbca2df 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -789,7 +789,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/driwindows_glx.c b/src/glx/driwindows_glx.c index b2dc810f8cb..85525431bf9 100644 --- a/src/glx/driwindows_glx.c +++ b/src/glx/driwindows_glx.c @@ -240,7 +240,7 @@ driwindows_create_context_attribs(struct glx_screen *base, identical values, so far */ - if (!psc->base.driScreen || !config_base) + if (!psc->base.driScreen) return NULL; /* Check the renderType value */ diff --git a/src/glx/g_glxglvnddispatchfuncs.c b/src/glx/g_glxglvnddispatchfuncs.c index 78c097febb6..0f02ed2d321 100644 --- a/src/glx/g_glxglvnddispatchfuncs.c +++ b/src/glx/g_glxglvnddispatchfuncs.c @@ -160,19 +160,7 @@ static GLXContext dispatch_CreateContextAttribsARB(Display *dpy, __GLXvendorInfo *dd; GLXContext ret; - if (config) { - dd = GetDispatchFromFBConfig(dpy, config); - } else if (attrib_list) { - int i, screen; - - for (i = 0; attrib_list[i * 2] != None; i++) { - if (attrib_list[i * 2] == GLX_SCREEN) { - screen = attrib_list[i * 2 + 1]; - dd = GetDispatchFromDrawable(dpy, RootWindow(dpy, screen)); - break; - } - } - } + dd = GetDispatchFromFBConfig(dpy, config); if (dd == NULL) return None; diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 85041ad5c51..8927976f587 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -238,7 +238,7 @@ validate_renderType_against_config(const struct glx_config *config, { /* GLX_EXT_no_config_context supports any render type */ if (!config) - return renderType == GLX_DONT_CARE; + return True; switch (renderType) { case GLX_RGBA_TYPE: @@ -269,9 +269,6 @@ glx_context_init(struct glx_context *gc, gc->isDirect = GL_TRUE; gc->currentContextTag = -1; - if (!config) - gc->renderType = GLX_DONT_CARE; - return True; } diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c index ada17939177..f6a7a31a219 100644 --- a/src/glx/glxextensions.c +++ b/src/glx/glxextensions.c @@ -147,7 +147,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 4406b7c5654..bbdb00dd631 100644 --- a/src/glx/glxextensions.h +++ b/src/glx/glxextensions.h @@ -51,7 +51,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, diff --git a/src/glx/tests/create_context_unittest.cpp b/src/glx/tests/create_context_unittest.cpp index d19271b47ef..a2590589db2 100644 --- a/src/glx/tests/create_context_unittest.cpp +++ b/src/glx/tests/create_context_unittest.cpp @@ -172,6 +172,15 @@ TEST_F(glXCreateContextAttribARB_test, NULL_display_returns_None) EXPECT_EQ(0, fake_glx_context::contexts_allocated); } +TEST_F(glXCreateContextAttribARB_test, NULL_fbconfig_returns_None) +{ + GLXContext ctx = + glXCreateContextAttribsARB(this->dpy, NULL, 0, False, NULL); + + EXPECT_EQ(None, ctx); + EXPECT_EQ(0, fake_glx_context::contexts_allocated); +} + TEST_F(glXCreateContextAttribARB_test, NULL_screen_returns_None) { delete psc; -- 2.30.2