Fixed a minor bug

panda/src/wgldisplay/wglGraphicsBuffer.cxx

@@ -91,10 +91,8 @@ begin_frame(FrameMode mode) {
     }
   }
 
-  wglGraphicsPipe *wglpipe;
-  DCAST_INTO_R(wglpipe, _pipe, false);
-  wglpipe->wgl_make_current(_pbuffer_dc, wglgsg->get_context(_pbuffer_dc),
-                            &_make_current_pcollector);
+  wglGraphicsPipe::wgl_make_current(_pbuffer_dc, wglgsg->get_context(_pbuffer_dc),
+                                    &_make_current_pcollector);
   
   if (mode == FM_render) {
     begin_render_texture();
@@ -309,10 +307,8 @@ open_buffer() {
     return false;
   }
 
-  wglGraphicsPipe *wglpipe;
-  DCAST_INTO_R(wglpipe, _pipe, false);
-  wglpipe->wgl_make_current(twindow_dc, wglgsg->get_context(twindow_dc),
-                            &_make_current_pcollector);
+  wglGraphicsPipe::wgl_make_current(twindow_dc, wglgsg->get_context(twindow_dc),
+                                    &_make_current_pcollector);
   wglgsg->reset_if_new();
 
   // Now that we have fully made a window and used that window to
@@ -320,14 +316,14 @@ open_buffer() {
   // This might fail if the pbuffer extensions are not supported.
 
   if (!make_pbuffer(twindow_dc)) {
-    wglpipe->wgl_make_current(0, 0, &_make_current_pcollector);
+    wglGraphicsPipe::wgl_make_current(0, 0, &_make_current_pcollector);
     return false;
   }
 
   _pbuffer_dc = wglgsg->_wglGetPbufferDCARB(_pbuffer);
   
-  wglpipe->wgl_make_current(_pbuffer_dc, wglgsg->get_context(_pbuffer_dc),
-                            &_make_current_pcollector);
+  wglGraphicsPipe::wgl_make_current(_pbuffer_dc, wglgsg->get_context(_pbuffer_dc),
+                                    &_make_current_pcollector);
   wglgsg->report_my_gl_errors();
   
   _is_valid = true;

panda/src/wgldisplay/wglGraphicsStateGuardian.cxx

@@ -308,6 +308,7 @@ make_context(HDC hdc) {
   _made_context = true;
 
   // Attempt to create a context.
+  wglGraphicsPipe::_current_valid = false;
   _context = wglCreateContext(hdc);
 
   if (_context == NULL) {

panda/src/wgldisplay/wglGraphicsWindow.cxx

@@ -174,9 +174,7 @@ begin_frame(FrameMode mode) {
   HGLRC context = wglgsg->get_context(_hdc);
   nassertr(context, false);
   
-  wglGraphicsPipe *wglpipe;
-  DCAST_INTO_R(wglpipe, _pipe, false);
-  wglpipe->wgl_make_current(_hdc, context, &_make_current_pcollector);
+  wglGraphicsPipe::wgl_make_current(_hdc, context, &_make_current_pcollector);
   wglgsg->reset_if_new();
 
   if (mode == FM_render) {
@@ -242,9 +240,7 @@ begin_flip() {
     DCAST_INTO_V(wglgsg, _gsg);
     HGLRC context = wglgsg->get_context(_hdc);
     nassertv(context);
-    wglGraphicsPipe *wglpipe;
-    DCAST_INTO_V(wglpipe, _pipe);
-    wglpipe->wgl_make_current(_hdc, context, &_make_current_pcollector);
+    wglGraphicsPipe::wgl_make_current(_hdc, context, &_make_current_pcollector);
     SwapBuffers(_hdc);
   }
 }
@@ -258,9 +254,7 @@ begin_flip() {
 void wglGraphicsWindow::
 close_window() {
   if (_gsg != (GraphicsStateGuardian *)NULL) {
-    wglGraphicsPipe *wglpipe;
-    DCAST_INTO_V(wglpipe, _pipe);
-    wglpipe->wgl_make_current(_hdc, NULL, &_make_current_pcollector);
+    wglGraphicsPipe::wgl_make_current(_hdc, NULL, &_make_current_pcollector);
     _gsg.clear();
     _active = false;
   }