RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix no-ddraw HW bug

This commit is contained in:
cxgeorge 2001-08-02 21:16:30 +00:00
parent 569444c7d6
commit b8aa4a77bd
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
panda/src/wgldisplay/wglGraphicsWindow.cxx
View File

@ -248,15 +248,20 @@ static DWORD GetAvailVidMem(void) {
ZeroMemory(&ddsCaps,sizeof(DDSCAPS2));
ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY; //set internally by DX anyway, dont think this any different than 0x0
if(FAILED( hr = pDD2->GetAvailableVidMem(&ddsCaps,&dwTotal,&dwFree))) {
wgldisplay_cat.fatal() << "GetAvailableVidMem failed : result = " << ConvDDErrorToString(hr) << endl;
exit(1);
if(FAILED(hr = pDD2->GetAvailableVidMem(&ddsCaps,&dwTotal,&dwFree))) {
if(hr==DDERR_NODIRECTDRAWHW) {
if(wgldisplay_cat.is_debug())
wgldisplay_cat.debug() << "GetAvailableVidMem returns no-DDraw HW, assuming we have plenty of vidmem\n";
dwTotal=dwFree=0x7FFFFFFF;
} else {
wgldisplay_cat.fatal() << "GetAvailableVidMem failed : result = " << ConvDDErrorToString(hr) << endl;
exit(1);
}
} else {
if(wgldisplay_cat.is_debug())
wgldisplay_cat.debug() << "before FullScreen switch: GetAvailableVidMem returns Total: " << dwTotal/1000000.0 << " Free: " << dwFree/1000000.0 << endl;
}
#ifdef _DEBUG
wgldisplay_cat.debug() << "before FullScreen switch: GetAvailableVidMem returns Total: " << dwTotal/1000000.0 << " Free: " << dwFree/1000000.0 << endl;
#endif
pDD2->Release(); // bye-bye ddraw
return dwFree;
@ -1023,8 +1028,8 @@ void wglGraphicsWindow::end_frame(void) {
{
PStatTimer timer(_swap_pcollector);
if(_is_synced) glFinish();
else SwapBuffers(_hdc);
if(_is_synced) glFinish();
else SwapBuffers(_hdc);
}
GraphicsWindow::end_frame();
}