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

fix build for opt2

Browse Source
This commit is contained in:
Samir Naik 2003-01-14 00:54:08 +00:00
parent c1a04c4486
commit ddeb0bc305
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx
View File

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

2
panda/src/dxgsg8/wdxGraphicsWindow8.cxx
View File

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