glx/glx_ext_import_context/make current, multi process: fail
glx/glx_ext_import_context/make current, single process: fail
glx/glx_ext_import_context/query context info: fail
-glx/glx_ext_no_config_context/no fbconfig: skip
hiz/hiz-depth-read-fbo-d24-s8: skip
hiz/hiz-depth-stencil-test-fbo-d24-s8: skip
hiz/hiz-depth-test-fbo-d24-s8: skip
glx/glx_ext_import_context/make current, multi process: fail
glx/glx_ext_import_context/make current, single process: fail
glx/glx_ext_import_context/query context info: fail
-glx/glx_ext_no_config_context/no fbconfig: skip
hiz/hiz-depth-read-fbo-d24-s8: skip
hiz/hiz-depth-read-window-stencil0: crash
hiz/hiz-depth-read-window-stencil1: crash
/* 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;
xcb_void_cookie_t cookie;
unsigned dummy_err = 0;
uint32_t xid, share_xid;
+ int screen = -1;
- if (dpy == NULL || cfg == NULL)
+ if (dpy == 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, cfg->screen);
- if (psc == NULL)
- return NULL;
-
- assert(cfg->screen == psc->scr);
-
/* Count the number of attributes specified by the application. All
* attributes appear in pairs, except the terminating None.
*/
/* 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;
+ }
+ }
+
+ /* 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);
+ if (psc == NULL)
+ return NULL;
+
+ assert(screen == psc->scr);
+
if (direct && psc->vtable->create_context_attribs) {
/* GLX drops the error returned by the driver. The expectation is that
* an error will also be returned by the server. The server's error
cookie =
xcb_glx_create_context_attribs_arb_checked(c,
xid,
- cfg->fbconfigID,
- cfg->screen,
+ cfg ? cfg->fbconfigID : 0,
+ screen,
share_xid,
gc ? gc->isDirect : direct,
num_attribs,
__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) |
__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) |
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.
*/
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.
*/
identical values, so far
*/
- if (!psc->base.driScreen)
+ if (!psc->base.driScreen || !config_base)
return NULL;
/* Check the renderType value */
__GLXvendorInfo *dd;
GLXContext ret;
- dd = GetDispatchFromFBConfig(dpy, config);
+ 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;
+ }
+ }
+ }
if (dd == NULL)
return None;
{
/* GLX_EXT_no_config_context supports any render type */
if (!config)
- return True;
+ return renderType == GLX_DONT_CARE;
switch (renderType) {
case GLX_RGBA_TYPE:
gc->isDirect = GL_TRUE;
gc->currentContextTag = -1;
+ if (!config)
+ gc->renderType = GLX_DONT_CARE;
+
return True;
}
case GLX_VERSION:
return (__glXGLXClientVersion);
case GLX_EXTENSIONS:
- return (__glXGetClientExtensions());
+ return (__glXGetClientExtensions(dpy));
default:
return NULL;
}
{ GLX(EXT_fbconfig_packed_float), Y, N },
{ GLX(EXT_framebuffer_sRGB), Y, N },
{ GLX(EXT_import_context), Y, N },
+ { GLX(EXT_no_config_context), N, N },
{ GLX(EXT_swap_control), N, Y },
{ GLX(EXT_swap_control_tear), N, Y },
{ GLX(EXT_texture_from_pixmap), N, N },
* Get the string of client library supported extensions.
*/
const char *
-__glXGetClientExtensions(void)
+__glXGetClientExtensions(Display *dpy)
{
if (__glXGLXClientExtensions == NULL) {
__glXExtensionsCtr();
EXT_fbconfig_packed_float_bit,
EXT_framebuffer_sRGB_bit,
EXT_import_context_bit,
+ EXT_no_config_context_bit,
EXT_swap_control_bit,
EXT_swap_control_tear_bit,
EXT_texture_from_pixmap_bit,
extern GLboolean __glXExtensionBitIsEnabled(struct glx_screen *psc,
unsigned bit);
-extern const char *__glXGetClientExtensions(void);
+extern const char *__glXGetClientExtensions(Display *dpy);
extern void __glXCalculateUsableExtensions(struct glx_screen *psc,
GLboolean
display_is_direct_capable,
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 (fake_glx_screen *)psc;