From 46b614a7c3c5b1b30d1f29a3c7b5c6e082e11c2c Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 12 Oct 2010 13:23:44 +0100 Subject: [PATCH] pixel-array: Remove flags member and flag macros There are no flags associated with pixel-arrays so we don't need the flags member or flag macros. --- cogl/cogl-pixel-array-private.h | 18 ------------------ cogl/cogl-pixel-array.c | 2 -- 2 files changed, 20 deletions(-) diff --git a/cogl/cogl-pixel-array-private.h b/cogl/cogl-pixel-array-private.h index 9b362927e..d613f45ca 100644 --- a/cogl/cogl-pixel-array-private.h +++ b/cogl/cogl-pixel-array-private.h @@ -37,32 +37,14 @@ G_BEGIN_DECLS #define COGL_PIXEL_ARRAY(array) ((CoglPixelArray *)(array)) -#define COGL_PIXEL_ARRAY_SET_FLAG(array, flag) \ - ((array)->flags |= (COGL_PIXEL_ARRAY_FLAG_ ## flag)) - -#define COGL_PIXEL_ARRAY_CLEAR_FLAG(array, flag) \ - ((array)->flags &= ~(COGL_PIXEL_ARRAY_FLAG_ ## flag)) - -#define COGL_PIXEL_ARRAY_FLAG_IS_SET(array, flag) \ - ((array)->flags & (COGL_PIXEL_ARRAY_FLAG_ ## flag)) - -typedef enum _CoglPixelArrayFlags -{ - COGL_PIXEL_ARRAY_FLAG_NONE = 0, - COGL_PIXEL_ARRAY_FLAG_STORE_CREATED = 1 << 0, -} CoglPixelArrayFlags; - struct _CoglPixelArray { CoglBuffer _parent; - CoglPixelArrayFlags flags; - CoglPixelFormat format; unsigned int width; unsigned int height; unsigned int stride; - }; GQuark diff --git a/cogl/cogl-pixel-array.c b/cogl/cogl-pixel-array.c index f9cd86453..c3416d668 100644 --- a/cogl/cogl-pixel-array.c +++ b/cogl/cogl-pixel-array.c @@ -109,8 +109,6 @@ _cogl_pixel_array_new (unsigned int size) COGL_BUFFER_USAGE_HINT_TEXTURE, COGL_BUFFER_UPDATE_HINT_STATIC); - pixel_array->flags = COGL_PIXEL_ARRAY_FLAG_NONE; - /* return COGL_INVALID_HANDLE; */ return _cogl_pixel_array_object_new (pixel_array); }