diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-03-24 02:15:17 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-03-25 21:06:11 +0300 |
commit | b9962d00708ecdf4c4b32a04ef59fb15af52c6c4 (patch) | |
tree | dc7c2baf1279b170c2176e6d53677bb7a994ade4 /source/blender/draw | |
parent | e02480fd16df5202cb5a711ed86a7d367529a98f (diff) |
DRW: Remove unecessary push/pull attrib.
Since we are rendering draw manager's command in a separate context, we
don't need to save/restore the UI opengl state attributes/config.
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index db59c083b42..8377d212788 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1317,8 +1317,6 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph) ViewportEngineData *data = drw_viewport_engine_data_ensure(draw_engine_type); /* set default viewport */ - gpuPushAttrib(GPU_ENABLE_BIT | GPU_VIEWPORT_BIT); - glDisable(GL_SCISSOR_TEST); glViewport(0, 0, size[0], size[1]); /* Main rendering. */ @@ -1357,16 +1355,6 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph) /* TODO grease pencil */ GPU_viewport_free(DST.viewport); - - DRW_state_reset(); - /* FIXME GL_DEPTH_TEST is enabled by default but it seems - * to trigger some bad behaviour / artifacts if it's turned - * on at this point. */ - glDisable(GL_DEPTH_TEST); - - /* Restore Drawing area. */ - gpuPopAttrib(); - glEnable(GL_SCISSOR_TEST); GPU_framebuffer_restore(); /* Changing Context */ @@ -1467,9 +1455,6 @@ void DRW_draw_select_loop( } } - gpuPushAttrib(GPU_ENABLE_BIT | GPU_VIEWPORT_BIT); - glDisable(GL_SCISSOR_TEST); - struct GPUViewport *viewport = GPU_viewport_create(); GPU_viewport_size_set(viewport, (const int[2]){BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)}); @@ -1538,7 +1523,6 @@ void DRW_draw_select_loop( DRW_state_reset(); DRW_draw_callbacks_pre_scene(); - DRW_state_lock( DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_ALWAYS | @@ -1576,10 +1560,6 @@ void DRW_draw_select_loop( /* Cleanup for selection state */ GPU_viewport_free(viewport); - /* Restore Drawing area. */ - gpuPopAttrib(); - glEnable(GL_SCISSOR_TEST); - /* restore */ rv3d->viewport = backup_viewport; #endif /* USE_GPU_SELECT */ @@ -1642,9 +1622,6 @@ void DRW_draw_depth_loop( /* Reset before using it. */ memset(&DST, 0x0, offsetof(DRWManager, ogl_context)); - gpuPushAttrib(GPU_ENABLE_BIT | GPU_VIEWPORT_BIT); - glDisable(GL_SCISSOR_TEST); - struct GPUViewport *viewport = GPU_viewport_create(); GPU_viewport_size_set(viewport, (const int[2]){ar->winx, ar->winy}); @@ -1720,10 +1697,6 @@ void DRW_draw_depth_loop( /* Cleanup for selection state */ GPU_viewport_free(viewport); - /* Restore Drawing area. */ - gpuPopAttrib(); - glEnable(GL_SCISSOR_TEST); - /* Changin context */ DRW_opengl_context_disable(); |