Skip to content

Fix glx reset #1315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −17
Open

Fix glx reset #1315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
557c0b5
dix: partially revert https://github.com/X11Libre/xserver/commit/8399…
stefan11111 Nov 1, 2025
28b0869
glx: revert https://github.com/X11Libre/xserver/commit/cb85ceae2dd50f…
stefan11111 Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion dix/callback_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@
void InitCallbackManager(void);
void DeleteCallbackManager(void);

typedef struct _CallbackRec {
CallbackProcPtr proc;
void *data;
Bool deleted;
struct _CallbackRec *next;
} CallbackRec, *CallbackPtr;

typedef struct _CallbackList {
int inCallback;
Bool deleted;
int numDeleted;
CallbackPtr list;
} CallbackListRec;

/*
* @brief delete a callback list
*
Expand All @@ -19,7 +33,6 @@ void DeleteCallbackManager(void);
*
* @param pcbl pointer to the list head (CallbackListPtr)
*/
_X_EXPORT /* only for GLX module */
void DeleteCallbackList(CallbackListPtr *pcbl);

#endif /* _XSERVER_CALLBACK_PRIV_H */
14 changes: 0 additions & 14 deletions dix/dixutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,20 +652,6 @@ ClientIsAsleep(ClientPtr client)

/* ===== Private Procedures ===== */

typedef struct _CallbackRec {
CallbackProcPtr proc;
void *data;
Bool deleted;
struct _CallbackRec *next;
} CallbackRec, *CallbackPtr;

typedef struct _CallbackList {
int inCallback;
Bool deleted;
int numDeleted;
CallbackPtr list;
} CallbackListRec;

static size_t numCallbackListsToCleanup = 0;
static CallbackListPtr **listsToCleanup = NULL;

Expand Down
9 changes: 7 additions & 2 deletions glx/vndext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ Bool noGlxExtension = FALSE;

ExtensionEntry *GlxExtensionEntry;
int GlxErrorBase = 0;
static CallbackListPtr vndInitCallbackListPtr = NULL;
static CallbackListRec vndInitCallbackList;
static CallbackListPtr vndInitCallbackListPtr = &vndInitCallbackList;
static DevPrivateKeyRec glvXGLVScreenPrivKey;
static DevPrivateKeyRec glvXGLVClientPrivKey;

Expand Down Expand Up @@ -199,7 +200,11 @@ GLXReset(ExtensionEntry *extEntry)
GlxMappingReset();

if ((dispatchException & DE_TERMINATE) == DE_TERMINATE) {
DeleteCallbackList(&vndInitCallbackListPtr);
while (vndInitCallbackList.list != NULL) {
CallbackPtr next = vndInitCallbackList.list->next;
free(vndInitCallbackList.list);
vndInitCallbackList.list = next;
}
}
}

Expand Down