diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2017-05-16 21:18:57 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2017-05-16 21:30:17 +0300 |
commit | 90aff807ab9c3b75511f49e8e22daa39c76b9b8a (patch) | |
tree | 36bc9f57eb63825b969c25ebb0b25692434d4e17 /source/blender/draw/modes | |
parent | ddc5896c81ad247fac440b86657b9843c315dd88 (diff) |
Draw Manager: Texture Memory usage improvement.
-Use 11_11_10 buffers for hdr content.
-Eevee compositing share 1 buffer if bloom and DOF are both activated.
-Fix slowdown when resizing EEVEE viewport.
-Removed DRW_BUF_*** enums causing confusion.
Diffstat (limited to 'source/blender/draw/modes')
-rw-r--r-- | source/blender/draw/modes/edit_curve_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_lattice_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_metaball_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_surface_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_text_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/object_mode.c | 6 | ||||
-rw-r--r-- | source/blender/draw/modes/paint_texture_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/particle_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/sculpt_mode.c | 4 |
10 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c index 7cdaf7c50e6..ae3201fa297 100644 --- a/source/blender/draw/modes/edit_curve_mode.c +++ b/source/blender/draw/modes/edit_curve_mode.c @@ -140,8 +140,8 @@ static void EDIT_CURVE_engine_init(void *vedata) /* Init Framebuffers like this: order is attachment order (for color texs) */ /* - * DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24, 0}, - * {&txl->color, DRW_BUF_RGBA_8, DRW_TEX_FILTER}}; + * DRWFboTexture tex[2] = {{&txl->depth, DRW_TEX_DEPTH_24, 0}, + * {&txl->color, DRW_TEX_RGBA_8, DRW_TEX_FILTER}}; */ /* DRW_framebuffer_init takes care of checking if diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c index 32411ea470d..2993719ee1c 100644 --- a/source/blender/draw/modes/edit_lattice_mode.c +++ b/source/blender/draw/modes/edit_lattice_mode.c @@ -130,8 +130,8 @@ static void EDIT_LATTICE_engine_init(void *vedata) /* Init Framebuffers like this: order is attachment order (for color texs) */ /* - * DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24, 0}, - * {&txl->color, DRW_BUF_RGBA_8, DRW_TEX_FILTER}}; + * DRWFboTexture tex[2] = {{&txl->depth, DRW_TEX_DEPTH_24, 0}, + * {&txl->color, DRW_TEX_RGBA_8, DRW_TEX_FILTER}}; */ /* DRW_framebuffer_init takes care of checking if diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index e06aea64be8..286d277f0e3 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -135,8 +135,8 @@ static void EDIT_MESH_engine_init(void *vedata) const float *viewport_size = DRW_viewport_size_get(); DRWFboTexture tex[2] = {{ - &e_data.occlude_wire_depth_tx, DRW_BUF_DEPTH_24, DRW_TEX_TEMP}, - {&e_data.occlude_wire_color_tx, DRW_BUF_RGBA_8, DRW_TEX_FILTER | DRW_TEX_TEMP} + &e_data.occlude_wire_depth_tx, DRW_TEX_DEPTH_24, DRW_TEX_TEMP}, + {&e_data.occlude_wire_color_tx, DRW_TEX_RGBA_8, DRW_TEX_FILTER | DRW_TEX_TEMP} }; DRW_framebuffer_init( &fbl->occlude_wire_fb, &draw_engine_edit_mesh_type, diff --git a/source/blender/draw/modes/edit_metaball_mode.c b/source/blender/draw/modes/edit_metaball_mode.c index 3bf26ae7adf..a5857ba362a 100644 --- a/source/blender/draw/modes/edit_metaball_mode.c +++ b/source/blender/draw/modes/edit_metaball_mode.c @@ -117,8 +117,8 @@ static void EDIT_METABALL_engine_init(void *vedata) /* Init Framebuffers like this: order is attachment order (for color texs) */ /* - * DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24, 0}, - * {&txl->color, DRW_BUF_RGBA_8, DRW_TEX_FILTER}}; + * DRWFboTexture tex[2] = {{&txl->depth, DRW_TEX_DEPTH_24, 0}, + * {&txl->color, DRW_TEX_RGBA_8, DRW_TEX_FILTER}}; */ /* DRW_framebuffer_init takes care of checking if diff --git a/source/blender/draw/modes/edit_surface_mode.c b/source/blender/draw/modes/edit_surface_mode.c index 0e1049b7a10..577b84e38c6 100644 --- a/source/blender/draw/modes/edit_surface_mode.c +++ b/source/blender/draw/modes/edit_surface_mode.c @@ -117,8 +117,8 @@ static void EDIT_SURFACE_engine_init(void *vedata) /* Init Framebuffers like this: order is attachment order (for color texs) */ /* - * DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24, 0}, - * {&txl->color, DRW_BUF_RGBA_8, DRW_TEX_FILTER}}; + * DRWFboTexture tex[2] = {{&txl->depth, DRW_TEX_DEPTH_24, 0}, + * {&txl->color, DRW_TEX_RGBA_8, DRW_TEX_FILTER}}; */ /* DRW_framebuffer_init takes care of checking if diff --git a/source/blender/draw/modes/edit_text_mode.c b/source/blender/draw/modes/edit_text_mode.c index 03da9ebbb94..13c8015e628 100644 --- a/source/blender/draw/modes/edit_text_mode.c +++ b/source/blender/draw/modes/edit_text_mode.c @@ -127,8 +127,8 @@ static void EDIT_TEXT_engine_init(void *vedata) /* Init Framebuffers like this: order is attachment order (for color texs) */ /* - * DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24, 0}, - * {&txl->color, DRW_BUF_RGBA_8, DRW_TEX_FILTER}}; + * DRWFboTexture tex[2] = {{&txl->depth, DRW_TEX_DEPTH_24, 0}, + * {&txl->color, DRW_TEX_RGBA_8, DRW_TEX_FILTER}}; */ /* DRW_framebuffer_init takes care of checking if diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index fb0d5bd0a8d..badf532fe2c 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -215,8 +215,8 @@ static void OBJECT_engine_init(void *vedata) if (DRW_state_is_fbo()) { DRWFboTexture tex[2] = { - {&e_data.outlines_depth_tx, DRW_BUF_DEPTH_24, DRW_TEX_TEMP}, - {&e_data.outlines_color_tx, DRW_BUF_RGBA_8, DRW_TEX_FILTER | DRW_TEX_TEMP}, + {&e_data.outlines_depth_tx, DRW_TEX_DEPTH_24, DRW_TEX_TEMP}, + {&e_data.outlines_color_tx, DRW_TEX_RGBA_8, DRW_TEX_FILTER | DRW_TEX_TEMP}, }; DRW_framebuffer_init( @@ -224,7 +224,7 @@ static void OBJECT_engine_init(void *vedata) (int)viewport_size[0], (int)viewport_size[1], tex, 2); - DRWFboTexture blur_tex = {&e_data.outlines_blur_tx, DRW_BUF_RGBA_8, DRW_TEX_FILTER | DRW_TEX_TEMP}; + DRWFboTexture blur_tex = {&e_data.outlines_blur_tx, DRW_TEX_RGBA_8, DRW_TEX_FILTER | DRW_TEX_TEMP}; DRW_framebuffer_init( &fbl->blur, &draw_engine_object_type, (int)viewport_size[0], (int)viewport_size[1], diff --git a/source/blender/draw/modes/paint_texture_mode.c b/source/blender/draw/modes/paint_texture_mode.c index 39c0b495fd5..d2316534cfe 100644 --- a/source/blender/draw/modes/paint_texture_mode.c +++ b/source/blender/draw/modes/paint_texture_mode.c @@ -117,8 +117,8 @@ static void PAINT_TEXTURE_engine_init(void *vedata) /* Init Framebuffers like this: order is attachment order (for color texs) */ /* - * DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24, 0}, - * {&txl->color, DRW_BUF_RGBA_8, DRW_TEX_FILTER}}; + * DRWFboTexture tex[2] = {{&txl->depth, DRW_TEX_DEPTH_24, 0}, + * {&txl->color, DRW_TEX_RGBA_8, DRW_TEX_FILTER}}; */ /* DRW_framebuffer_init takes care of checking if diff --git a/source/blender/draw/modes/particle_mode.c b/source/blender/draw/modes/particle_mode.c index f1ec8a2ec75..4b63a00d0a5 100644 --- a/source/blender/draw/modes/particle_mode.c +++ b/source/blender/draw/modes/particle_mode.c @@ -111,8 +111,8 @@ static void PARTICLE_engine_init(void *vedata) /* Init Framebuffers like this: order is attachment order (for color texs) */ /* - * DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24, 0}, - * {&txl->color, DRW_BUF_RGBA_8, DRW_TEX_FILTER}}; + * DRWFboTexture tex[2] = {{&txl->depth, DRW_TEX_DEPTH_24, 0}, + * {&txl->color, DRW_TEX_RGBA_8, DRW_TEX_FILTER}}; */ /* DRW_framebuffer_init takes care of checking if diff --git a/source/blender/draw/modes/sculpt_mode.c b/source/blender/draw/modes/sculpt_mode.c index 7bbf551bcd9..ba9f530ae40 100644 --- a/source/blender/draw/modes/sculpt_mode.c +++ b/source/blender/draw/modes/sculpt_mode.c @@ -121,8 +121,8 @@ static void SCULPT_engine_init(void *vedata) /* Init Framebuffers like this: order is attachment order (for color texs) */ /* - * DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24, 0}, - * {&txl->color, DRW_BUF_RGBA_8, DRW_TEX_FILTER}}; + * DRWFboTexture tex[2] = {{&txl->depth, DRW_TEX_DEPTH_24, 0}, + * {&txl->color, DRW_TEX_RGBA_8, DRW_TEX_FILTER}}; */ /* DRW_framebuffer_init takes care of checking if |