OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "glx: Implement GLX_EXT_no_config_context (v2)"

Browse Source 
Pushed ahead of things actually working.

This reverts commit 5293b96b16.
This commit is contained in:
Adam Jackson
2017-11-09 11:41:14 -05:00
parent 9ceb057ebf
commit 015cc6bb7c
6 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/glx/create_context.c
View File

@@ -47,11 +47,21 @@ 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)
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, 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.
*/
@@ -60,29 +70,6 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
/* 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];
}
}
/* 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 (!cfg && !__glXExtensionBitIsEnabled(psc, EXT_no_config_context_bit))
return NULL;
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
@@ -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,