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:
parent
6ff6465931
commit
8b3d26f5b6
|
@ -850,10 +850,6 @@ PanoramiXTranslateVisualID(int screen, VisualID orig)
|
|||
VisualPtr pVisual = NULL;
|
||||
int i;
|
||||
|
||||
/* if screen is 0, orig is already the correct visual ID */
|
||||
if (screen == 0)
|
||||
return orig;
|
||||
|
||||
for (i = 0; i < PanoramiXNumVisuals; i++) {
|
||||
if (orig == PanoramiXVisuals[i].vid) {
|
||||
pVisual = &PanoramiXVisuals[i];
|
||||
|
@ -864,6 +860,10 @@ PanoramiXTranslateVisualID(int screen, VisualID orig)
|
|||
if (!pVisual)
|
||||
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 */
|
||||
for (i = 0; i < pOtherScreen->numVisuals; i++) {
|
||||
VisualPtr pOtherVisual = &pOtherScreen->visuals[i];
|
||||
|
|
Loading…
Reference in New Issue