fix build for opt2

panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx

@@ -203,7 +203,7 @@ dbgPrintVidMem(LPDIRECTDRAW7 pDD, LPDDSCAPS2 lpddsCaps,const char *pMsg) {
   //  ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; done internally by DX anyway
   
   if(FAILED(  hr = pDD->GetAvailableVidMem(&ddsCaps,&dwTotal,&dwFree))) {
-    wdxdisplay_cat.debug() << "GetAvailableVidMem failed : result = " << ConvD3DErrorToString(hr) << endl;
+    wdxdisplay7_cat.debug() << "GetAvailableVidMem failed : result = " << ConvD3DErrorToString(hr) << endl;
     exit(1);
   }
 
@@ -211,8 +211,8 @@ dbgPrintVidMem(LPDIRECTDRAW7 pDD, LPDDSCAPS2 lpddsCaps,const char *pMsg) {
   char tmpstr[100],tmpstr2[100];
   sprintf(tmpstr,"%.4g",dwTotal/1000000.0);
   sprintf(tmpstr2,"%.4g",dwFree/1000000.0);
-  if(wdxdisplay_cat.is_debug())
-    wdxdisplay_cat.debug() << "AvailableVidMem before creating "<< pMsg << ",(megs) total: " << tmpstr << "  free:" << tmpstr2 <<endl;
+  if(wdxdisplay7_cat.is_debug())
+    wdxdisplay7_cat.debug() << "AvailableVidMem before creating "<< pMsg << ",(megs) total: " << tmpstr << "  free:" << tmpstr2 <<endl;
 }
 #endif
 

panda/src/dxgsg8/wdxGraphicsWindow8.cxx

@@ -1407,6 +1407,7 @@ init_resized_window() {
     //    _props._xorg = client_rect.left;  // _props should reflect view rectangle
     //    _props._yorg = client_rect.top;
 
+    /*
 #ifdef _DEBUG
     // try to make sure GDI and DX agree on window client area size
     // but client rect will not include any offscreen areas, so dont
@@ -1423,6 +1424,7 @@ init_resized_window() {
       assert((RECT_X_SIZE(client_rect) == newWidth) &&
              (RECT_Y_SIZE(client_rect) == newHeight));
 #endif
+    */
   }
 
   //  resized(newWidth, newHeight);  // update panda channel/display rgn info, _props.x_size, _props.y_size