aboutsummaryrefslogtreecommitdiff
path: root/generic/Image.h
diff options
context:
space:
mode:
Diffstat (limited to 'generic/Image.h')
-rw-r--r--generic/Image.h20
1 files changed, 17 insertions, 3 deletions
diff --git a/generic/Image.h b/generic/Image.h
index 66d73a7..415d4d5 100644
--- a/generic/Image.h
+++ b/generic/Image.h
@@ -33,6 +33,9 @@
#ifdef LIBART
#include <libart_lgpl/libart.h>
#endif
+#ifdef GLX
+#include <GL/gl.h>
+#endif
#include "Types.h"
@@ -44,7 +47,6 @@ typedef struct {
int rowstride;
} BitmapBits;
-
typedef struct {
XImage *pixels;
XImage *mask;
@@ -55,6 +57,12 @@ typedef struct {
#ifdef LIBART
ArtPixBuf *pixbuf;
#endif
+#ifdef GLX
+ unsigned char *i_bits;
+ GLuint texture;
+ ZnReal t;
+ ZnReal s;
+#endif
} ImageBits;
typedef struct _SuckChar {
@@ -119,14 +127,20 @@ tile_svp_alpha(const ArtSVP *svp,
int x0, int y0, int x1, int y1,
int tile_x, int tile_y, ArtPixBuf *tile,
art_u8 alpha, art_u8 *buf, int rowstride);
+#endif
-#ifdef SHM
+#ifdef LIBART
ArtPixBuf *
GetImagePixbuf(ZnWindow /* win */,
char */* image_name */,
ZnImage /* image */);
#endif
-#endif
+#ifdef GLX
+ImageBits *
+GetImageTexture(ZnWindow /* win */,
+ char */* image_name */,
+ ZnImage /* image */);
+#endif
#endif /* _Image_h */