frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Short-circuit PanoramiXTranslateVisualID after verifying that the visual actually exists first. 

This allows using PanoramiXTranslateVisualID to test whether a given visual made
it through PanoramiXVisualConsolidate.
This commit is contained in:
Aaron Plattner 2008-05-20 12:39:28 -07:00
parent 6ff6465931
commit 8b3d26f5b6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Xext/panoramiX.c
View File

@ -850,10 +850,6 @@ PanoramiXTranslateVisualID(int screen, VisualID orig)
VisualPtr pVisual = NULL; VisualPtr pVisual = NULL;
int i; int i;
/* if screen is 0, orig is already the correct visual ID */
if (screen == 0)
return orig;
for (i = 0; i < PanoramiXNumVisuals; i++) { for (i = 0; i < PanoramiXNumVisuals; i++) {
if (orig == PanoramiXVisuals[i].vid) { if (orig == PanoramiXVisuals[i].vid) {
pVisual = &PanoramiXVisuals[i]; pVisual = &PanoramiXVisuals[i];
@ -864,6 +860,10 @@ PanoramiXTranslateVisualID(int screen, VisualID orig)
if (!pVisual) if (!pVisual)
return 0; return 0;
/* if screen is 0, orig is already the correct visual ID */
if (screen == 0)
return orig;
/* found the original, now translate it relative to the backend screen */ /* found the original, now translate it relative to the backend screen */
for (i = 0; i < pOtherScreen->numVisuals; i++) { for (i = 0; i < pOtherScreen->numVisuals; i++) {
VisualPtr pOtherVisual = &pOtherScreen->visuals[i]; VisualPtr pOtherVisual = &pOtherScreen->visuals[i];