summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/blurfx.h
diff options
context:
space:
mode:
authorlupine <lupine@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-17 18:55:21 +0000
committerlupine <lupine@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-17 18:55:21 +0000
commit657be39da76039bb3070191e9309510a19039eb0 (patch)
treee706224be8eabd1730e877f8fcb93002fbbcb381 /beryl-plugins/src/blurfx.h
parentd6e66cbdbecad2fb427e86b243690d0bf4755c15 (diff)
downloadmarex-dev-657be39da76039bb3070191e9309510a19039eb0.tar.gz
marex-dev-657be39da76039bb3070191e9309510a19039eb0.tar.bz2
Fix bug #378; also change display.c's HOME_IMGDIR from .compiz/images to .beryl/images
git-svn-id: file:///beryl/trunk@1835 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/blurfx.h')
-rw-r--r--beryl-plugins/src/blurfx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/beryl-plugins/src/blurfx.h b/beryl-plugins/src/blurfx.h
index 6b9cb85..b04263b 100644
--- a/beryl-plugins/src/blurfx.h
+++ b/beryl-plugins/src/blurfx.h
@@ -24,7 +24,7 @@
#define BLURFX_H_
#include "blurfx_shader.h"
-
+#include <string.h>
#define GET_BLURFX_DISPLAY(d) \
((BlurfxDisplay *) (d)->privates[displayPrivateIndex].ptr)
@@ -355,7 +355,7 @@ static Bool moreVertices (BlurfxVertArray *vA, int newSize);
static void initBlurfxScreen(BlurfxScreen* bs,int Screenwidth,int Screenheight,CompScreen* s);
static void genBlurTexture(BlurfxScreen *bs,BlurTexture *tex,int width,int height,int type);
static void loadShader(GLenum type,CompScreen* s, GLuint * shader, const char * prog);
-static void loadPngToTexture2D(BlurfxScreen* bs,BlurTexture * tex, char* filename);
+static void loadPngToTexture2D(CompScreen *s, BlurfxScreen * bs, BlurTexture * tex, char *filename);
static void enableBlurfxTexture(BlurTexture* tex, CompTextureFilter filter);
static void switchBlurfxTexture(BlurTexture* from, BlurTexture* to, CompTextureFilter filter);
static void disableBlurfxTexture(BlurTexture* tex);