fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-09 03:20:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

driconf: add a way to override GLX_CONTEXT_RESET_ISOLATION_BIT_ARB

Browse source 
This allows us to override and clear the reset isolation bit.
It will be used in the following patch to override missing support
for GLX_CONTEXT_RESET_ISOLATION_BIT_ARB.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38668>
This commit is contained in:
Timothy Arceri 2025-11-26 11:22:16 +11:00 • committed by Marge Bot
parent f5351afbc8
commit 67eeee43e0
3 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
View file

@ -49,6 +49,7 @@ DRI_CONF_SECTION_DEBUG
DRI_CONF_FORCE_GL_VENDOR()
DRI_CONF_FORCE_GL_RENDERER()
DRI_CONF_OVERRIDE_VRAM_SIZE()
DRI_CONF_GLX_CLEAR_CONTEXT_RESET_ISOLATION_BIT(false)
DRI_CONF_GLX_EXTENSION_OVERRIDE()
DRI_CONF_MESA_EXTENSION_OVERRIDE()
DRI_CONF_INDIRECT_GL_EXTENSION_OVERRIDE()

36
src/glx/create_context.c
View file

@ -22,6 +22,7 @@
*/
#include <limits.h>
#include "dri_util.h"
#include "glxclient.h"
#include "glx_error.h"
#include <xcb/glx.h>
@ -44,7 +45,7 @@
GLXContext
glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
GLXContext share_context, Bool direct,
const int *attrib_list)
const int *orig_attrib_list)
{
xcb_connection_t *const c = XGetXCBConnection(dpy);
struct glx_config *const cfg = (struct glx_config *) config;
@ -57,6 +58,7 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
unsigned error = BadImplementation;
uint32_t xid, share_xid;
int screen = -1;
int *attrib_list = NULL;
if (dpy == NULL)
return NULL;
@ -64,8 +66,8 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
/* 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++)
if (orig_attrib_list != NULL) {
for (/* empty */; orig_attrib_list[num_attribs * 2] != 0; num_attribs++)
/* empty */ ;
}
@ -73,8 +75,8 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
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 (orig_attrib_list[i * 2] == GLX_SCREEN)
screen = orig_attrib_list[i * 2 + 1];
}
if (screen == -1) {
__glXSendError(dpy, BadValue, 0, X_GLXCreateContextAttribsARB, True);
@ -92,6 +94,27 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
assert(screen == psc->scr);
if (orig_attrib_list != NULL) {
attrib_list = malloc(sizeof(int) * num_attribs * 2);
uint8_t clear_ctx_reset_isolation_bit = false;
dri2GalliumConfigQueryb(psc->frontend_screen,
"glx_clear_context_reset_isolation_bit",
&clear_ctx_reset_isolation_bit);
for (unsigned i = 0; i < num_attribs; i++) {
attrib_list[i * 2] = orig_attrib_list[i * 2];
if (clear_ctx_reset_isolation_bit &&
attrib_list[i * 2] == GLX_CONTEXT_FLAGS_ARB) {
attrib_list[i * 2 + 1] =
orig_attrib_list[i * 2 + 1] & ~__DRI_CTX_FLAG_RESET_ISOLATION;
} else {
attrib_list[i * 2 + 1] =
orig_attrib_list[i * 2 + 1];
}
}
}
/* 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.
*/
@ -130,6 +153,8 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
__glXSendError(dpy, error, -1, 0, False);
else
__glXSendError(dpy, error, -1, 0, True);
free(attrib_list);
return NULL;
}
@ -167,5 +192,6 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
gc->share_xid = share_xid;
}
free(attrib_list);
return (GLXContext) gc;
}

3
src/util/driconf.h
View file

@ -308,6 +308,9 @@
DRI_CONF_OPT_S_NODEF(glx_extension_override, \
"Allow enabling/disabling a list of GLX extensions")
#define DRI_CONF_GLX_CLEAR_CONTEXT_RESET_ISOLATION_BIT(def) \
DRI_CONF_OPT_B(glx_clear_context_reset_isolation_bit, def, "Clear context reset isolation bit before creating context")
#define DRI_CONF_INDIRECT_GL_EXTENSION_OVERRIDE() \
DRI_CONF_OPT_S_NODEF(indirect_gl_extension_override, \
"Allow enabling/disabling a list of indirect-GL extensions")