summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/blurfx.c
diff options
context:
space:
mode:
authoronestone <onestone@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-10 22:44:56 +0000
committeronestone <onestone@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-10 22:44:56 +0000
commitc0093c266b934a17b33e2f5bae4c0a71afa2b3d5 (patch)
tree7eeeb8d6f518901a9007b63c5a92631ca54a774b /beryl-plugins/src/blurfx.c
parentffa474c936f8ac728882c9c66051d227ff793d2b (diff)
downloadmarex-dev-c0093c266b934a17b33e2f5bae4c0a71afa2b3d5.tar.gz
marex-dev-c0093c266b934a17b33e2f5bae4c0a71afa2b3d5.tar.bz2
fixed scale blur. closes #430
git-svn-id: file:///beryl/trunk@584 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/blurfx.c')
-rw-r--r--beryl-plugins/src/blurfx.c30
1 files changed, 6 insertions, 24 deletions
diff --git a/beryl-plugins/src/blurfx.c b/beryl-plugins/src/blurfx.c
index a224595..da18ee0 100644
--- a/beryl-plugins/src/blurfx.c
+++ b/beryl-plugins/src/blurfx.c
@@ -2497,13 +2497,6 @@ updateBlur (CompWindow * w, CompScreen * s, const WindowPaintAttrib * attrib,
glPushMatrix ();
- if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
- {
- glTranslatef (w->attrib.x, w->attrib.y, 0.0f);
- glScalef (attrib->xScale, attrib->yScale, 0.0f);
- glTranslatef (-w->attrib.x, -w->attrib.y, 0.0f);
- }
-
// enable projective texture cooridinate generation
float bm[16] =
{ s->width / 2.0, 0, 0, 0, 0, s->height / 2.0, 0, 0, 0, 0, 1, 0,
@@ -2511,11 +2504,9 @@ updateBlur (CompWindow * w, CompScreen * s, const WindowPaintAttrib * attrib,
};
float bpm[16];
float tm[16];
- if (!bw->mvm_updated)
- {
- bw->mvm_updated = TRUE;
- glGetFloatv (GL_MODELVIEW_MATRIX, bw->mvm);
- }
+
+ bw->mvm_updated = FALSE;
+ glGetFloatv (GL_MODELVIEW_MATRIX, bw->mvm);
MULTM (bm, bs->pm, bpm);
MULTM (bpm, bw->mvm, tm);
@@ -3172,13 +3163,6 @@ updateBlurNoFBO (CompWindow * w, CompScreen * s,
glPushMatrix ();
- if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
- {
- glTranslatef (w->attrib.x, w->attrib.y, 0.0f);
- glScalef (attrib->xScale, attrib->yScale, 0.0f);
- glTranslatef (-w->attrib.x, -w->attrib.y, 0.0f);
- }
-
// enable projective texture cooridinate generation
float bm[16] =
{ s->width / 2.0, 0, 0, 0, 0, s->height / -2.0, 0, 0, 0, 0, 1, 0,
@@ -3186,11 +3170,9 @@ updateBlurNoFBO (CompWindow * w, CompScreen * s,
};
float bpm[16];
float tm[16];
- if (!bw->mvm_updated)
- {
- bw->mvm_updated = TRUE;
- glGetFloatv (GL_MODELVIEW_MATRIX, bw->mvm);
- }
+
+ bw->mvm_updated = FALSE;
+ glGetFloatv (GL_MODELVIEW_MATRIX, bw->mvm);
MULTM (bm, bs->pm, bpm);
MULTM (bpm, bw->mvm, tm);