Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2006-03-08 15:28:46 +0300
committerTon Roosendaal <ton@blender.org>2006-03-08 15:28:46 +0300
commit8d345b916d6f65a6cc7be091acd233420f20c5a1 (patch)
tree1f02ec4e2a90a6700f95770f6e33f15501519b90 /source/blender/src/renderwin.c
parent2db9b8fe7f423d4662af557f6144452610a8073d (diff)
Test with render window not drawing in frontbuffer anymore. Only enabled
now for OSX though... that's where we can verify if the irregular crashes will stop (ATI issue, nvidia seems to be OK) If ATI users for other platforms want to check; just extend the two #ifdefs I added for frontbuffer drawing. Note; the syntax then becomes #if defined(__APPLE__) || defined(_YOUR_PLATFORM_)
Diffstat (limited to 'source/blender/src/renderwin.c')
-rw-r--r--source/blender/src/renderwin.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c
index 7ba91350327..bea32212779 100644
--- a/source/blender/src/renderwin.c
+++ b/source/blender/src/renderwin.c
@@ -804,15 +804,22 @@ static void renderwin_progress(RenderWin *rw, RenderResult *rr, volatile rcti *r
glEnable(GL_SCISSOR_TEST);
glaDefine2DArea(&win_rct);
+#ifdef __APPLE__
+#else
glDrawBuffer(GL_FRONT);
+#endif
glPixelZoom(rw->zoom, rw->zoom);
glaDrawPixelsSafe(fullrect[0][0], fullrect[0][1], rr->rectx-2*rr->crop, ymax, rr->rectx,
GL_RGBA, GL_FLOAT, rectf);
glPixelZoom(1.0, 1.0);
+#ifdef __APPLE__
+ window_swap_buffers(render_win->win);
+#else
/* no glFlush(); here... threads render hates it! */
glFinish();
glDrawBuffer(GL_BACK);
+#endif
}
@@ -857,12 +864,19 @@ static void printrenderinfo_cb(RenderStats *rs)
if(render_win->render_text) MEM_freeN(render_win->render_text);
render_win->render_text= BLI_strdup(str);
+#ifdef __APPLE__
+#else
glDrawBuffer(GL_FRONT);
+#endif
renderwin_draw_render_info(render_win);
+#ifdef __APPLE__
+ window_swap_buffers(render_win->win);
+#else
/* no glFlush(); here... threads render hates it! */
glFinish();
glDrawBuffer(GL_BACK);
+#endif
}
/* temporal render debug printing, needed for testing orange renders atm... will be gone soon (or option) */