diff options
Diffstat (limited to 'cogl/cogl-atlas-texture-private.h')
| -rw-r--r-- | cogl/cogl-atlas-texture-private.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cogl/cogl-atlas-texture-private.h b/cogl/cogl-atlas-texture-private.h index f4fdb720..c2c9fbd8 100644 --- a/cogl/cogl-atlas-texture-private.h +++ b/cogl/cogl-atlas-texture-private.h @@ -26,7 +26,7 @@ #include "cogl-handle.h" #include "cogl-texture-private.h" -#include "cogl-atlas.h" +#include "cogl-rectangle-map.h" #define COGL_ATLAS_TEXTURE(tex) ((CoglAtlasTexture *) tex) @@ -34,23 +34,23 @@ typedef struct _CoglAtlasTexture CoglAtlasTexture; struct _CoglAtlasTexture { - CoglTexture _parent; + CoglTexture _parent; /* The format that the texture is in. This isn't necessarily the same format as the atlas texture because we can store pre-multiplied and non-pre-multiplied textures together */ - CoglPixelFormat format; + CoglPixelFormat format; /* The rectangle that was used to add this texture to the atlas. This includes the 1-pixel border */ - CoglAtlasRectangle rectangle; + CoglRectangleMapEntry rectangle; /* The texture might need to be migrated out in which case this will be set to TRUE and sub_texture will actually be a real texture */ - gboolean in_atlas; + gboolean in_atlas; /* A CoglSubTexture representing the region for easy rendering */ - CoglHandle sub_texture; + CoglHandle sub_texture; }; GQuark |