summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/blurfx.c
diff options
context:
space:
mode:
authormaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-18 08:00:02 +0000
committermaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-18 08:00:02 +0000
commit19eaebbc0522d8b07ab14f38b81f37f375a51d04 (patch)
treece43ac3899430f6f52bf3701f02ed26291fd1ded /beryl-plugins/src/blurfx.c
parent52018bbd39b0135b104c13229ff9f84deb077293 (diff)
downloadmarex-dev-19eaebbc0522d8b07ab14f38b81f37f375a51d04.tar.gz
marex-dev-19eaebbc0522d8b07ab14f38b81f37f375a51d04.tar.bz2
blurfx plugin: slight cleanup - don't pass both CompScreen and BlurfxScreen to function
git-svn-id: file:///beryl/trunk@1856 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/blurfx.c')
-rw-r--r--beryl-plugins/src/blurfx.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/beryl-plugins/src/blurfx.c b/beryl-plugins/src/blurfx.c
index 62e0e2d..eee803a 100644
--- a/beryl-plugins/src/blurfx.c
+++ b/beryl-plugins/src/blurfx.c
@@ -555,7 +555,7 @@ blurfxSetScreenOption (CompScreen * s, char *name, CompOptionValue * value)
{
if (bs->reflection_supported)
{
- loadPngToTexture2D (s, bs, &bs->modTex, value->s);
+ loadPngToTexture2D (s, &bs->modTex, value->s);
damageScreen (s);
}
return TRUE;
@@ -567,7 +567,7 @@ blurfxSetScreenOption (CompScreen * s, char *name, CompOptionValue * value)
{
if (bs->reflection_supported)
{
- loadPngToTexture2D (s, bs, &bs->modTex,
+ loadPngToTexture2D (s, &bs->modTex,
bs->
opt
[BLURFX_SCREEN_OPTION_REFLECTION_FILE].
@@ -4596,7 +4596,7 @@ initBlurfxScreen (BlurfxScreen * bs, int Screenwidth, int Screenheight,
if (bs->reflection_supported)
{
// load reflection map
- loadPngToTexture2D (s, bs, &bs->modTex,
+ loadPngToTexture2D (s, &bs->modTex,
bs->
opt
[BLURFX_SCREEN_OPTION_REFLECTION_FILE].value.s);
@@ -4695,8 +4695,7 @@ loadShader (GLenum type, CompScreen * s, GLuint * shader, const char *prog)
// load png
static void
-loadPngToTexture2D (CompScreen * s, BlurfxScreen * bs, BlurTexture * tex,
- char *filename)
+loadPngToTexture2D (CompScreen * s, BlurTexture * tex, char *filename)
{
int img_w = 0, img_h = 0, stride = 0;
@@ -4708,6 +4707,8 @@ loadPngToTexture2D (CompScreen * s, BlurfxScreen * bs, BlurTexture * tex,
float Y, R, G, B;
int pix;
+ BLURFX_SCREEN(s);
+
if (strlen (filename) == 0)
return;