summaryrefslogtreecommitdiff
path: root/glamor/glamor_utils.h
diff options
context:
space:
mode:
Diffstat (limited to 'glamor/glamor_utils.h')
-rw-r--r--glamor/glamor_utils.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h
index 81820069e..59e6b6479 100644
--- a/glamor/glamor_utils.h
+++ b/glamor/glamor_utils.h
@@ -33,6 +33,7 @@
#define __GLAMOR_UTILS_H__
#include "glamor_prepare.h"
+#include "mipict.h"
#define v_from_x_coord_x(_xscale_, _x_) ( 2 * (_x_) * (_xscale_) - 1.0)
#define v_from_x_coord_y(_yscale_, _y_) (-2 * (_y_) * (_yscale_) + 1.0)
@@ -756,7 +757,6 @@ glamor_translate_boxes(BoxPtr boxes, int nbox, int dx, int dy)
|| _depth_ == 30 \
|| _depth_ == 32)
-#define GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv) (pixmap_priv->is_picture == 1)
#define GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv) (pixmap_priv->gl_fbo == GLAMOR_FBO_NORMAL)
/**
@@ -1287,9 +1287,9 @@ glamor_compare_pictures(ScreenPtr screen,
if (fst_pixmap->drawable.depth != snd_pixmap->drawable.depth) {
if (fst_generated)
- glamor_destroy_picture(fst_picture);
+ miDestroyPicture(fst_picture);
if (snd_generated)
- glamor_destroy_picture(snd_picture);
+ miDestroyPicture(snd_picture);
ErrorF("Different pixmap depth can not compare!\n");
return;
@@ -1315,9 +1315,9 @@ glamor_compare_pictures(ScreenPtr screen,
glamor_finish_access(&snd_pixmap->drawable);
if (fst_generated)
- glamor_destroy_picture(fst_picture);
+ miDestroyPicture(fst_picture);
if (snd_generated)
- glamor_destroy_picture(snd_picture);
+ miDestroyPicture(snd_picture);
return;
}