XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

glx: canonical walkScreen variable on screen list iterations

Browse Source 
When iterating screen lists, consistently use the same variable name
`walkScreen` for holding current screen pointer everywhere.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-12 18:51:31 +02:00
committed by Enrico Weigelt
parent 8f39f58f51
commit d8149d9c9e
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
glx/glxext.c
View File

@@ -287,11 +287,11 @@ checkScreenVisuals(void)
int i, j; int i, j;
for (i = 0; i < screenInfo.numScreens; i++) { for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr screen = screenInfo.screens[i]; ScreenPtr walkScreen = screenInfo.screens[i];
for (j = 0; j < screen->numVisuals; j++) { for (j = 0; j < walkScreen->numVisuals; j++) {
if ((screen->visuals[j].class == TrueColor || if ((walkScreen->visuals[j].class == TrueColor ||
screen->visuals[j].class == DirectColor) && walkScreen->visuals[j].class == DirectColor) &&
screen->visuals[j].nplanes > 12) walkScreen->visuals[j].nplanes > 12)
return TRUE; return TRUE;
} }
} }
@@ -537,17 +537,17 @@ xorgGlxServerInit(CallbackListPtr *pcbl, void *param, void *ext)
} }
for (i = 0; i < screenInfo.numScreens; i++) { for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr pScreen = screenInfo.screens[i]; ScreenPtr walkScreen = screenInfo.screens[i];
__GLXprovider *p; __GLXprovider *p;
if (glxServer.getVendorForScreen(NULL, pScreen) != NULL) { if (glxServer.getVendorForScreen(NULL, walkScreen) != NULL) {
// There's already a vendor registered. // There's already a vendor registered.
LogMessage(X_INFO, "GLX: Another vendor is already registered for screen %d\n", i); LogMessage(X_INFO, "GLX: Another vendor is already registered for screen %d\n", i);
continue; continue;
} }
for (p = __glXProviderStack; p != NULL; p = p->next) { for (p = __glXProviderStack; p != NULL; p = p->next) {
__GLXscreen *glxScreen = p->screenProbe(pScreen); __GLXscreen *glxScreen = p->screenProbe(walkScreen);
if (glxScreen != NULL) { if (glxScreen != NULL) {
LogMessage(X_INFO, LogMessage(X_INFO,
"GLX: Initialized %s GL provider for screen %d\n", "GLX: Initialized %s GL provider for screen %d\n",
@@ -558,7 +558,7 @@ xorgGlxServerInit(CallbackListPtr *pcbl, void *param, void *ext)
} }
if (p) { if (p) {
glxServer.setScreenVendor(pScreen, glvnd_vendor); glxServer.setScreenVendor(walkScreen, glvnd_vendor);
} else { } else {
LogMessage(X_INFO, LogMessage(X_INFO,
"GLX: no usable GL providers found for screen %d\n", i); "GLX: no usable GL providers found for screen %d\n", i);

18
glx/vndext.c
View File

@@ -98,9 +98,10 @@ GlxMappingReset(void)
int i; int i;
for (i=0; i<screenInfo.numScreens; i++) { for (i=0; i<screenInfo.numScreens; i++) {
GlxScreenPriv *priv = xglvGetScreenPrivate(screenInfo.screens[i]); ScreenPtr walkScreen = screenInfo.screens[i];
GlxScreenPriv *priv = xglvGetScreenPrivate(walkScreen);
if (priv != NULL) { if (priv != NULL) {
xglvSetScreenPrivate(screenInfo.screens[i], NULL); xglvSetScreenPrivate(walkScreen, NULL);
free(priv); free(priv);
} }
} }
@@ -112,7 +113,8 @@ GlxMappingInit(void)
int i; int i;
for (i=0; i<screenInfo.numScreens; i++) { for (i=0; i<screenInfo.numScreens; i++) {
if (GlxGetScreen(screenInfo.screens[i]) == NULL) { ScreenPtr walkScreen = screenInfo.screens[i];
if (GlxGetScreen(walkScreen) == NULL) {
GlxMappingReset(); GlxMappingReset();
return FALSE; return FALSE;
} }
@@ -153,7 +155,8 @@ GlxGetClientData(ClientPtr client)
cl->vendors = (GlxServerVendor **) (cl + 1); cl->vendors = (GlxServerVendor **) (cl + 1);
for (i=0; i<screenInfo.numScreens; i++) for (i=0; i<screenInfo.numScreens; i++)
{ {
cl->vendors[i] = GlxGetVendorForScreen(NULL, screenInfo.screens[i]); ScreenPtr walkScreen = screenInfo.screens[i];
cl->vendors[i] = GlxGetVendorForScreen(NULL, walkScreen);
} }
xglvSetClientPrivate(client, cl); xglvSetClientPrivate(client, cl);
@@ -250,9 +253,12 @@ GlxExtensionInit(void)
CallCallbacks(&vndInitCallbackListPtr, extEntry); CallCallbacks(&vndInitCallbackListPtr, extEntry);
/* We'd better have found at least one vendor */ /* We'd better have found at least one vendor */
for (int i = 0; i < screenInfo.numScreens; i++) for (int i = 0; i < screenInfo.numScreens; i++) {
if (GlxGetVendorForScreen(serverClient, screenInfo.screens[i])) ScreenPtr walkScreen = screenInfo.screens[i];
if (GlxGetVendorForScreen(serverClient, walkScreen))
return; return;
}
extEntry->base = 0; extEntry->base = 0;
} }