single-buffer

This commit is contained in:
David Rose 2004-02-19 21:18:39 +00:00
parent 751dc0f17a
commit 36dc54b6c6
2 changed files with 22 additions and 10 deletions

View File

@ -102,9 +102,8 @@ end_frame() {
// If we've lost the pbuffer image (due to a mode-switch, for // If we've lost the pbuffer image (due to a mode-switch, for
// instance), don't attempt to copy it to the texture, since the // instance), don't attempt to copy it to the texture, since the
// frame is invalid. For excruciating correctness, we should // frame is invalid. In fact, now we need to recreate the
// force the frame to be re-rendered, but we'll just discard the // pbuffer.
// frame instead.
if (_pbuffer_dc) { if (_pbuffer_dc) {
int flag = 0; int flag = 0;
wglgsg->_wglQueryPbufferARB(_pbuffer, WGL_PBUFFER_LOST_ARB, &flag); wglgsg->_wglQueryPbufferARB(_pbuffer, WGL_PBUFFER_LOST_ARB, &flag);
@ -120,8 +119,10 @@ end_frame() {
// extension, if it is available, to render directly into a // extension, if it is available, to render directly into a
// texture in the first place (but I don't have a card that // texture in the first place (but I don't have a card that
// supports that right now). // supports that right now).
PT(DisplayRegion) dr = make_scratch_display_region(_x_size, _y_size); nassertv(has_texture());
get_texture()->copy(_gsg, dr, _gsg->get_render_buffer(RenderBuffer::T_back)); DisplayRegion dr(this, _x_size, _y_size);
RenderBuffer buffer = _gsg->get_render_buffer(get_draw_buffer_type());
get_texture()->copy(_gsg, &dr, buffer);
} }
} }

View File

@ -248,9 +248,18 @@ find_pixfmtnum(FrameBufferProperties &properties, HDC hdc,
continue; continue;
} }
DWORD dwReqFlags = (PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW); DWORD want_flags = (PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW);
if ((frame_buffer_mode & FrameBufferProperties::FM_double_buffer) != 0) { DWORD dont_want_flags = 0;
dwReqFlags|= PFD_DOUBLEBUFFER;
switch (frame_buffer_mode & FrameBufferProperties::FM_buffer) {
case FrameBufferProperties::FM_single_buffer:
dont_want_flags |= PFD_DOUBLEBUFFER;
break;
case FrameBufferProperties::FM_double_buffer:
case FrameBufferProperties::FM_triple_buffer:
want_flags |= PFD_DOUBLEBUFFER;
break;
} }
if (wgldisplay_cat.is_debug()) { if (wgldisplay_cat.is_debug()) {
@ -278,7 +287,8 @@ find_pixfmtnum(FrameBufferProperties &properties, HDC hdc,
} }
wgldisplay_cat.debug() wgldisplay_cat.debug()
<< "flags = " << format_pfd_flags(pfd.dwFlags) << " (missing " << "flags = " << format_pfd_flags(pfd.dwFlags) << " (missing "
<< format_pfd_flags((~pfd.dwFlags) & dwReqFlags) << ")\n"; << format_pfd_flags((~pfd.dwFlags) & want_flags) << ", extra "
<< format_pfd_flags(pfd.dwFlags & dont_want_flags) << ")\n";
} }
if ((frame_buffer_mode & FrameBufferProperties::FM_alpha) != 0 && if ((frame_buffer_mode & FrameBufferProperties::FM_alpha) != 0 &&
@ -300,7 +310,8 @@ find_pixfmtnum(FrameBufferProperties &properties, HDC hdc,
continue; continue;
} }
if ((pfd.dwFlags & dwReqFlags) != dwReqFlags) { if ((pfd.dwFlags & want_flags) != want_flags ||
(pfd.dwFlags & dont_want_flags) != 0) {
wgldisplay_cat.debug() wgldisplay_cat.debug()
<< " rejecting.\n"; << " rejecting.\n";
continue; continue;