diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-18 16:45:22 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-18 18:38:17 +0300 |
| commit | 8f7ae20f799cbba7a5ce60b18efb8401328aab44 (patch) | |
| tree | 4e9bf30286d0d4ffb47fb13bd59e50fd2e54545e /source/blender/makesdna/DNA_image_types.h | |
| parent | c94b3b19a2c07ce2617bf4998a1634f020660e4d (diff) | |
Cleanup: rename tpageflag to gpuflag, make it purely runtime data.
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 4a527d9b76f..b6ae324552f 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -90,8 +90,8 @@ typedef struct RenderSlot { /* iuser->flag */ #define IMA_ANIM_ALWAYS (1 << 0) -#define IMA_ANIM_REFRESHED (1 << 1) -/* #define IMA_DO_PREMUL (1 << 2) */ +/* #define IMA_DEPRECATED_1 (1 << 1) */ +/* #define IMA_DEPRECATED_2 (1 << 2) */ #define IMA_NEED_FRAME_RECALC (1 << 3) #define IMA_SHOW_STEREO (1 << 4) @@ -123,8 +123,8 @@ typedef struct Image { short source, type; int lastframe; - /* texture page */ - short tpageflag; + /* GPU texture flag. */ + short gpuflag; short pad2; unsigned int pad3; @@ -187,18 +187,14 @@ enum { IMA_FLAG_DEPRECATED_16 = (1 << 16), /* cleared */ }; -/* Image.tpageflag */ +/* Image.gpuflag */ enum { - IMA_TPAGEFLAG_DEPRECATED_0 = (1 << 0), /* cleared */ - IMA_TPAGEFLAG_DEPRECATED_1 = (1 << 1), /* cleared */ - IMA_TPAGEFLAG_DEPRECATED_2 = (1 << 2), /* cleared */ + /** GPU texture needs to be refreshed. */ + IMA_GPU_REFRESH = (1 << 0), /** All mipmap levels in OpenGL texture set? */ - IMA_MIPMAP_COMPLETE = (1 << 3), - IMA_TPAGEFLAG_DEPRECATED_4 = (1 << 4), /* cleared */ - IMA_TPAGEFLAG_DEPRECATED_5 = (1 << 5), /* cleared */ - IMA_TPAGE_REFRESH = (1 << 6), + IMA_GPU_MIPMAP_COMPLETE = (1 << 1), /** OpenGL image texture bound as non-color data. */ - IMA_GLBIND_IS_DATA = (1 << 7), + IMA_GPU_IS_DATA = (1 << 2), }; /* ima->type and ima->source moved to BKE_image.h, for API */ |