diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-04-12 12:49:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-12 12:51:14 +0300 |
commit | 0c9a2def8b1e40a0b5a3ed348d1fd92cc13096ff (patch) | |
tree | 8749b8080b9b02514cc7f9d08dab6391ce716844 /source/blender/draw/modes/edit_text_mode.c | |
parent | b380f4927e30bc2877b4f3a760fefa0dfc3614e1 (diff) |
Draw Engine: remove hard coded limit on array sizes
This removes MAX_STORAGE, MAX_BUFFERS, MAX_TEXTURES, MAX_PASSES limits.
Actual memory saving isn't so important, it just means we don't need to
manually bump these based on changes to engines.
Diffstat (limited to 'source/blender/draw/modes/edit_text_mode.c')
-rw-r--r-- | source/blender/draw/modes/edit_text_mode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/draw/modes/edit_text_mode.c b/source/blender/draw/modes/edit_text_mode.c index fc11ed90ea7..f105e2d316c 100644 --- a/source/blender/draw/modes/edit_text_mode.c +++ b/source/blender/draw/modes/edit_text_mode.c @@ -46,7 +46,6 @@ extern struct GlobalsUboStorage ts; /* draw_common.c */ * initialize most of them and EDIT_TEXT_cache_init() * for EDIT_TEXT_PassList */ -/* keep it under MAX_PASSES */ typedef struct EDIT_TEXT_PassList { /* Declare all passes here and init them in * EDIT_TEXT_cache_init(). @@ -54,14 +53,12 @@ typedef struct EDIT_TEXT_PassList { struct DRWPass *pass; } EDIT_TEXT_PassList; -/* keep it under MAX_BUFFERS */ typedef struct EDIT_TEXT_FramebufferList { /* Contains all framebuffer objects needed by this engine. * Only contains (GPUFrameBuffer *) */ struct GPUFrameBuffer *fb; } EDIT_TEXT_FramebufferList; -/* keep it under MAX_TEXTURES */ typedef struct EDIT_TEXT_TextureList { /* Contains all framebuffer textures / utility textures * needed by this engine. Only viewport specific textures @@ -69,7 +66,6 @@ typedef struct EDIT_TEXT_TextureList { struct GPUTexture *texture; } EDIT_TEXT_TextureList; -/* keep it under MAX_STORAGE */ typedef struct EDIT_TEXT_StorageList { /* Contains any other memory block that the engine needs. * Only directly MEM_(m/c)allocN'ed blocks because they are @@ -257,9 +253,12 @@ void EDIT_TEXT_collection_settings_create(CollectionEngineSettings *ces) } #endif +static const DrawEngineDataSize EDIT_TEXT_data_size = DRW_VIEWPORT_DATA_SIZE(EDIT_TEXT_Data); + DrawEngineType draw_engine_edit_text_type = { NULL, NULL, N_("EditTextMode"), + &EDIT_TEXT_data_size, &EDIT_TEXT_engine_init, &EDIT_TEXT_engine_free, &EDIT_TEXT_cache_init, |