DRI_CONF_INDIRECT_GL_EXTENSION_OVERRIDE()
DRI_CONF_DISABLE_PROTECTED_CONTENT_CHECK(false)
DRI_CONF_IGNORE_MAP_UNSYNCHRONIZED(false)
+ DRI_CONF_FORCE_DIRECT_GLX_CONTEXT(false)
DRI_CONF_SECTION_END
DRI_CONF_SECTION_MISCELLANEOUS
assert(screen == psc->scr);
+ /* Some application may request an indirect context but we may want to force a direct
+ * one because Xorg only allows indirect contexts if they were enabled.
+ */
+ if (!direct &&
+ psc->force_direct_context) {
+ direct = true;
+ }
+
+
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
&tmp) == 0)
__IndirectGlParseExtensionOverride(&psc->base, tmp);
+ if (psc->config->base.version > 1) {
+ uint8_t force = false;
+ if (psc->config->configQueryb(psc->driScreen, "force_direct_glx_context",
+ &force) == 0) {
+ psc->base.force_direct_context = force;
+ }
+ }
+
/* DRI2 supports SubBuffer through DRI2CopyRegion, so it's always
* available.*/
psp->copySubBuffer = dri2CopySubBuffer;
&tmp) == 0)
__IndirectGlParseExtensionOverride(&psc->base, tmp);
+ if (psc->config->base.version > 1) {
+ uint8_t force = false;
+ if (psc->config->configQueryb(psc->driScreen, "force_direct_glx_context",
+ &force) == 0) {
+ psc->base.force_direct_context = force;
+ }
+ }
+
free(driverName);
tmp = getenv("LIBGL_SHOW_FPS");
Display *dpy;
int scr;
+ bool force_direct_context;
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
/**
if (generic_id == None)
return NULL;
+ /* Some application may request an indirect context but we may want to force a direct
+ * one because Xorg only allows indirect contexts if they were enabled.
+ */
+ if (!allowDirect &&
+ psc->force_direct_context) {
+ allowDirect = 1;
+ }
+
gc = NULL;
#ifdef GLX_USE_APPLEGL
gc = applegl_create_context(psc, config, shareList, renderType);
this->scr = num;
this->visuals = 0;
this->configs = 0;
+ this->force_direct_context = false;
this->display = glx_dpy;
this->dpy = (glx_dpy != NULL) ? glx_dpy->dpy : NULL;
DRI_CONF_OPT_B(force_compat_profile, def, \
"Force an OpenGL compatibility context")
+#define DRI_CONF_FORCE_DIRECT_GLX_CONTEXT(def) \
+ DRI_CONF_OPT_B(force_direct_glx_context, def, \
+ "Force direct GLX context (even if indirect is requested)")
+
#define DRI_CONF_OVERRIDE_VRAM_SIZE() \
DRI_CONF_OPT_I(override_vram_size, -1, -1, 2147483647, \
"Override the VRAM size advertised to the application in MiB (-1 = default)")
/* Make the hash table big enough to fit more than the maximum number of
* config options we've ever seen in a driver.
*/
- info->tableSize = 6;
+ info->tableSize = 7;
info->info = calloc((size_t)1 << info->tableSize, sizeof(driOptionInfo));
info->values = calloc((size_t)1 << info->tableSize, sizeof(driOptionValue));
if (info->info == NULL || info->values == NULL) {