summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/blurfx.c
diff options
context:
space:
mode:
authorquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-27 18:52:48 +0000
committerquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-27 18:52:48 +0000
commit6405a5f5f4d09b17dff403429c0f0077fe8f1c71 (patch)
tree47921008430b433cac4c83e519d9bab187730436 /beryl-plugins/src/blurfx.c
parentc344fb07b194b4ac88d1cf9f78901f36d292c9cb (diff)
downloadmarex-dev-6405a5f5f4d09b17dff403429c0f0077fe8f1c71.tar.gz
marex-dev-6405a5f5f4d09b17dff403429c0f0077fe8f1c71.tar.bz2
MAJOR CODE CLEANUP
beryl no longer uses any extern'd variables, and has get() functions for the things that can't be static const'd git-svn-id: file:///beryl/trunk@837 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/blurfx.c')
-rw-r--r--beryl-plugins/src/blurfx.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/beryl-plugins/src/blurfx.c b/beryl-plugins/src/blurfx.c
index bb116f5..8efb2b3 100644
--- a/beryl-plugins/src/blurfx.c
+++ b/beryl-plugins/src/blurfx.c
@@ -1032,7 +1032,7 @@ blurfxPaintScreen (CompScreen * s, const ScreenPaintAttrib * sa,
}
// clear screen damage region
- XUnionRegion (&emptyRegion, &emptyRegion, bs->screenDamage);
+ XUnionRegion (getEmptyRegion(), getEmptyRegion(), bs->screenDamage);
// enable blur if needed
blur_fbo = bs->blur_supported && bs->fboBlur_supported
@@ -1065,7 +1065,7 @@ blurfxPaintScreen (CompScreen * s, const ScreenPaintAttrib * sa,
{
bs->mode = MODE_OCCLUSION;
bs->od_active = TRUE;
- XUnionRegion (&emptyRegion, &emptyRegion, bs->occlusion);
+ XUnionRegion (getEmptyRegion(), getEmptyRegion(), bs->occlusion);
CompWindow *w;
for (w = s->reverseWindows; w; w = w->prev)
{
@@ -1078,7 +1078,7 @@ blurfxPaintScreen (CompScreen * s, const ScreenPaintAttrib * sa,
if (w->attrib.map_state != IsViewable || !w->damaged)
continue;
}
- XUnionRegion (bs->occlusion, &emptyRegion, bw->clip);
+ XUnionRegion (bs->occlusion, getEmptyRegion(), bw->clip);
(*s->paintWindow) (w, &w->paint, &s->region,
PAINT_WINDOW_SOLID_MASK);
}
@@ -1384,7 +1384,7 @@ blurfxPaintTransformedScreen (CompScreen * s, const ScreenPaintAttrib * sa,
{
bs->mode = MODE_OCCLUSION;
bs->od_active = TRUE;
- XUnionRegion (&emptyRegion, &emptyRegion, bs->occlusion);
+ XUnionRegion (getEmptyRegion(), getEmptyRegion(), bs->occlusion);
CompWindow *w;
for (w = s->reverseWindows; w; w = w->prev)
{
@@ -1397,7 +1397,7 @@ blurfxPaintTransformedScreen (CompScreen * s, const ScreenPaintAttrib * sa,
if (w->attrib.map_state != IsViewable || !w->damaged)
continue;
}
- XUnionRegion (bs->occlusion, &emptyRegion, bw->clip);
+ XUnionRegion (bs->occlusion, getEmptyRegion(), bw->clip);
(*s->paintWindow) (w, &w->paint, &s->region,
PAINT_WINDOW_SOLID_MASK);
}
@@ -1532,11 +1532,11 @@ blurfxPaintWindow (CompWindow * w, const WindowPaintAttrib * attrib,
bw->decoArray.indexCount = 0;
// store region we need to paint
- XUnionRegion (&emptyRegion, &emptyRegion, bw->paintRegion);
+ XUnionRegion (getEmptyRegion(), getEmptyRegion(), bw->paintRegion);
XIntersectRegion (bs->realPaintRegion, region, bw->paintRegion);
bw->texUpdated = FALSE;
- XUnionRegion (&emptyRegion, &emptyRegion, bs->blurredRegion);
+ XUnionRegion (getEmptyRegion(), getEmptyRegion(), bs->blurredRegion);
// paint blur and reflection
@@ -1621,7 +1621,7 @@ blurfxPaintWindow (CompWindow * w, const WindowPaintAttrib * attrib,
}
bw->lastXScale = attrib->xScale;
bw->lastYScale = attrib->yScale;
- XUnionRegion (&emptyRegion, &emptyRegion, bw->damageRegion);
+ XUnionRegion (getEmptyRegion(), getEmptyRegion(), bw->damageRegion);
}
return status;
@@ -2665,8 +2665,8 @@ updateBlurTextureSize (CompWindow * w, CompScreen * s,
bw->bc_x = s->x;
bw->bc_y = s->y;
- XUnionRegion (&emptyRegion, &emptyRegion, bw->texDamage);
- XUnionRegion (&emptyRegion, &emptyRegion, bw->bTexRegion);
+ XUnionRegion (getEmptyRegion(), getEmptyRegion(), bw->texDamage);
+ XUnionRegion (getEmptyRegion(), getEmptyRegion(), bw->bTexRegion);
XUnionRectWithRegion (&box, bw->texDamage, bw->texDamage);
XUnionRectWithRegion (&box, bw->bTexRegion, bw->bTexRegion);
}
@@ -2737,8 +2737,8 @@ updateBlurTextureSize (CompWindow * w, CompScreen * s,
bw->bc_y = s->y;
// update to new regions and add damage
- XUnionRegion (&emptyRegion, &emptyRegion, bw->texDamage);
- XUnionRegion (&emptyRegion, &emptyRegion, bw->bTexRegion);
+ XUnionRegion (getEmptyRegion(), getEmptyRegion(), bw->texDamage);
+ XUnionRegion (getEmptyRegion(), getEmptyRegion(), bw->bTexRegion);
XUnionRectWithRegion (&box, bw->texDamage, bw->texDamage);
XUnionRectWithRegion (&box, bw->bTexRegion, bw->bTexRegion);
}
@@ -4441,7 +4441,7 @@ loadShader (GLenum type, CompScreen * s, GLuint * shader, const char *prog)
{
fprintf (stderr,
"%s: (0x%X) error loading fragment program at line: %d\n",
- programName, errorNum, errorPos);
+ getProgramName(), errorNum, errorPos);
fprintf (stderr, "%s\n", glGetString (GL_PROGRAM_ERROR_STRING_ARB));
glGetIntegerv (GL_MAX_PROGRAM_INSTRUCTIONS_ARB, &errorPos);
if (*shader)