TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

display: fix segfault when output is removed during render

Browse Source 
Fixes: #176
This commit is contained in:
rdb 2017-10-15 18:48:53 +02:00
parent 0db3d27247
commit bb60e8c373
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/display/graphicsEngine.cxx
View File

@ -1271,7 +1271,7 @@ set_window_sort(GraphicsOutput *window, int sort) {
* model begins with the "-" character. * model begins with the "-" character.
*/ */
void GraphicsEngine:: void GraphicsEngine::
cull_and_draw_together(const GraphicsEngine::Windows &wlist, cull_and_draw_together(GraphicsEngine::Windows wlist,
Thread *current_thread) { Thread *current_thread) {
PStatTimer timer(_cull_pcollector, current_thread); PStatTimer timer(_cull_pcollector, current_thread);
@ -1380,7 +1380,7 @@ cull_and_draw_together(GraphicsOutput *win, DisplayRegion *dr,
* drawing. * drawing.
*/ */
void GraphicsEngine:: void GraphicsEngine::
cull_to_bins(const GraphicsEngine::Windows &wlist, Thread *current_thread) { cull_to_bins(GraphicsEngine::Windows wlist, Thread *current_thread) {
PStatTimer timer(_cull_pcollector, current_thread); PStatTimer timer(_cull_pcollector, current_thread);
_singular_warning_last_frame = _singular_warning_this_frame; _singular_warning_last_frame = _singular_warning_this_frame;

4
panda/src/display/graphicsEngine.h
View File

@ -142,11 +142,11 @@ private:
void set_window_sort(GraphicsOutput *window, int sort); void set_window_sort(GraphicsOutput *window, int sort);
void cull_and_draw_together(const Windows &wlist, Thread *current_thread); void cull_and_draw_together(Windows wlist, Thread *current_thread);
void cull_and_draw_together(GraphicsOutput *win, DisplayRegion *dr, void cull_and_draw_together(GraphicsOutput *win, DisplayRegion *dr,
Thread *current_thread); Thread *current_thread);
void cull_to_bins(const Windows &wlist, Thread *current_thread); void cull_to_bins(Windows wlist, Thread *current_thread);
void cull_to_bins(GraphicsOutput *win, GraphicsStateGuardian *gsg, void cull_to_bins(GraphicsOutput *win, GraphicsStateGuardian *gsg,
DisplayRegion *dr, SceneSetup *scene_setup, DisplayRegion *dr, SceneSetup *scene_setup,
CullResult *cull_result, Thread *current_thread); CullResult *cull_result, Thread *current_thread);