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

composite: Remove unnecessary variable. 

We know that there is damage if the dynamic block handler is registered.

Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Pauli Nieminen 2010-12-30 19:19:35 +02:00 committed by Daniel Stone
parent c038b8b28e
commit ed8db09b4b
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composite/compalloc.c
View File

@ -50,14 +50,8 @@
static void static void
compScreenUpdate (ScreenPtr pScreen) compScreenUpdate (ScreenPtr pScreen)
{ {
CompScreenPtr cs = GetCompScreen (pScreen);
compCheckTree (pScreen); compCheckTree (pScreen);
if (cs->damaged) compWindowUpdate (pScreen->root);
{
compWindowUpdate (pScreen->root);
cs->damaged = FALSE;
}
} }
static void static void
@ -85,11 +79,9 @@ compReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)
CompScreenPtr cs = GetCompScreen (pScreen); CompScreenPtr cs = GetCompScreen (pScreen);
CompWindowPtr cw = GetCompWindow (pWin); CompWindowPtr cw = GetCompWindow (pWin);
if (!cs->damaged) { if (!cs->BlockHandler) {
cs->BlockHandler = pScreen->BlockHandler; cs->BlockHandler = pScreen->BlockHandler;
pScreen->BlockHandler = compBlockHandler; pScreen->BlockHandler = compBlockHandler;
cs->damaged = TRUE;
} }
cw->damaged = TRUE; cw->damaged = TRUE;
} }

1
composite/compinit.c
View File

@ -301,7 +301,6 @@ compScreenInit (ScreenPtr pScreen)
if (!cs) if (!cs)
return FALSE; return FALSE;
cs->damaged = FALSE;
cs->overlayWid = FakeClientID(0); cs->overlayWid = FakeClientID(0);
cs->pOverlayWin = NULL; cs->pOverlayWin = NULL;
cs->pOverlayClients = NULL; cs->pOverlayClients = NULL;

1
composite/compint.h
View File

@ -152,7 +152,6 @@ typedef struct _CompScreen {
ScreenBlockHandlerProcPtr BlockHandler; ScreenBlockHandlerProcPtr BlockHandler;
CloseScreenProcPtr CloseScreen; CloseScreenProcPtr CloseScreen;
Bool damaged;
int numAlternateVisuals; int numAlternateVisuals;
VisualID *alternateVisuals; VisualID *alternateVisuals;