archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

DRW: Fix crash caused by hair transform feedback

Browse Source 
Seem to be cause by the lack of proper FBO bound.
This commit is contained in:
Clément Foucault
2018-06-13 22:20:48 +02:00
parent 8d2309f94f
commit 2f3e890b94
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/eevee/eevee_render.c
View File

@@ -423,6 +423,8 @@ void EEVEE_render_draw(EEVEE_Data *vedata, RenderEngine *engine, RenderLayer *rl
DRW_render_instance_buffer_finish(); DRW_render_instance_buffer_finish();
/* Need to be called after DRW_render_instance_buffer_finish() */ /* Need to be called after DRW_render_instance_buffer_finish() */
/* Also we weed to have a correct fbo bound for DRW_hair_update */
GPU_framebuffer_bind(fbl->main_fb);
DRW_hair_update(); DRW_hair_update();
if ((view_layer->passflag & (SCE_PASS_SUBSURFACE_COLOR | if ((view_layer->passflag & (SCE_PASS_SUBSURFACE_COLOR |

12
source/blender/draw/intern/draw_manager.c
View File

@@ -1311,13 +1311,14 @@ void DRW_draw_render_loop_ex(
} }
DRW_stats_begin(); DRW_stats_begin();
DRW_hair_update();
GPU_framebuffer_bind(DST.default_framebuffer); GPU_framebuffer_bind(DST.default_framebuffer);
/* Start Drawing */ /* Start Drawing */
DRW_state_reset(); DRW_state_reset();
DRW_hair_update();
drw_engines_draw_background(); drw_engines_draw_background();
/* WIP, single image drawn over the camera view (replace) */ /* WIP, single image drawn over the camera view (replace) */
@@ -1737,8 +1738,6 @@ void DRW_draw_select_loop(
DRW_render_instance_buffer_finish(); DRW_render_instance_buffer_finish();
} }
DRW_hair_update();
/* Setup framebuffer */ /* Setup framebuffer */
draw_select_framebuffer_setup(rect); draw_select_framebuffer_setup(rect);
GPU_framebuffer_bind(g_select_buffer.framebuffer); GPU_framebuffer_bind(g_select_buffer.framebuffer);
@@ -1748,6 +1747,8 @@ void DRW_draw_select_loop(
DRW_state_reset(); DRW_state_reset();
DRW_draw_callbacks_pre_scene(); DRW_draw_callbacks_pre_scene();
DRW_hair_update();
DRW_state_lock( DRW_state_lock(
DRW_STATE_WRITE_DEPTH | DRW_STATE_WRITE_DEPTH |
DRW_STATE_DEPTH_ALWAYS | DRW_STATE_DEPTH_ALWAYS |
@@ -1897,10 +1898,11 @@ void DRW_draw_depth_loop(
DRW_render_instance_buffer_finish(); DRW_render_instance_buffer_finish();
} }
DRW_hair_update();
/* Start Drawing */ /* Start Drawing */
DRW_state_reset(); DRW_state_reset();
DRW_hair_update();
DRW_draw_callbacks_pre_scene(); DRW_draw_callbacks_pre_scene();
drw_engines_draw_scene(); drw_engines_draw_scene();
DRW_draw_callbacks_post_scene(); DRW_draw_callbacks_post_scene();