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

prevent crash when dx window is resized

Browse Source
This commit is contained in:
David Rose 2005-06-22 20:22:30 +00:00
parent dd69dd3322
commit 8f74a2ee57
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
View File

@ -561,7 +561,7 @@ prepare_display_region() {
HRESULT hr = _d3d_device->SetViewport(&vp); HRESULT hr = _d3d_device->SetViewport(&vp);
if (FAILED(hr)) { if (FAILED(hr)) {
dxgsg8_cat.error() dxgsg8_cat.error()
<< "pScrn_SwapChain = " << _screen->_swap_chain << " SwapChain = " << _swap_chain << "\n"; << "_screen->_swap_chain = " << _screen->_swap_chain << " _swap_chain = " << _swap_chain << "\n";
dxgsg8_cat.error() dxgsg8_cat.error()
<< "SetViewport(" << l << ", " << u << ", " << w << ", " << h << "SetViewport(" << l << ", " << u << ", " << w << ", " << h
<< ") failed" << D3DERRORSTRING(hr); << ") failed" << D3DERRORSTRING(hr);
@ -2906,7 +2906,7 @@ dx_cleanup() {
// only one window or it is the main window or // only one window or it is the main window or
// fullscreen mode then, it resets the device. Finally // fullscreen mode then, it resets the device. Finally
// it returns the new DXScreenData through parameter // it returns the new DXScreenData through parameter
// pScrn // screen
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
HRESULT DXGraphicsStateGuardian8:: HRESULT DXGraphicsStateGuardian8::
reset_d3d_device(D3DPRESENT_PARAMETERS *presentation_params, reset_d3d_device(D3DPRESENT_PARAMETERS *presentation_params,
@ -2917,7 +2917,10 @@ reset_d3d_device(D3DPRESENT_PARAMETERS *presentation_params,
assert(IS_VALID_PTR(_screen->_d3d8)); assert(IS_VALID_PTR(_screen->_d3d8));
assert(IS_VALID_PTR(_d3d_device)); assert(IS_VALID_PTR(_d3d_device));
release_all(); // It is not clear whether we need to call this or not. Calling
// this forces all of the textures and vbuffers to be regenerated,
// but it doesn't appear to be necessary.
//release_all();
// for windowed mode make sure our format matches the desktop fmt, // for windowed mode make sure our format matches the desktop fmt,
// in case the desktop mode has been changed // in case the desktop mode has been changed
@ -2942,7 +2945,7 @@ reset_d3d_device(D3DPRESENT_PARAMETERS *presentation_params,
} }
get_engine()->reset_all_windows(false);// reset old swapchain by releasing get_engine()->reset_all_windows(false);// reset old swapchain by releasing
if (_screen->_swap_chain) { //other windows might be using bigger buffers if (_screen->_swap_chain) { //other windows might be using bigger buffers
_presentation_reset.BackBufferWidth = max(_presentation_reset.BackBufferWidth, presentation_params->BackBufferWidth); _presentation_reset.BackBufferWidth = max(_presentation_reset.BackBufferWidth, presentation_params->BackBufferWidth);
_presentation_reset.BackBufferHeight = max(_presentation_reset.BackBufferHeight, presentation_params->BackBufferHeight); _presentation_reset.BackBufferHeight = max(_presentation_reset.BackBufferHeight, presentation_params->BackBufferHeight);
@ -2956,9 +2959,8 @@ reset_d3d_device(D3DPRESENT_PARAMETERS *presentation_params,
if (FAILED(hr)) { if (FAILED(hr)) {
return hr; return hr;
} }
get_engine()->reset_all_windows(true);// reset with new swapchains by creating get_engine()->reset_all_windows(true);// reset with new swapchains by creating
if (screen) { if (screen) {
*screen = NULL; *screen = NULL;
} }
@ -2966,13 +2968,15 @@ reset_d3d_device(D3DPRESENT_PARAMETERS *presentation_params,
if (presentation_params != &_screen->_presentation_params) { if (presentation_params != &_screen->_presentation_params) {
memcpy(&_screen->_presentation_params, presentation_params, sizeof(D3DPRESENT_PARAMETERS)); memcpy(&_screen->_presentation_params, presentation_params, sizeof(D3DPRESENT_PARAMETERS));
} }
return hr; return hr;
} }
// release the old swapchain and create a new one // release the old swapchain and create a new one
if (_screen && _screen->_swap_chain) { if (_screen && _screen->_swap_chain) {
_screen->_swap_chain->Release(); _screen->_swap_chain->Release();
wdxdisplay8_cat.debug() << "SwapChain " << _screen->_swap_chain << " is released\n"; wdxdisplay8_cat.debug()
<< "swap chain " << _screen->_swap_chain << " is released\n";
_screen->_swap_chain = NULL; _screen->_swap_chain = NULL;
hr = _d3d_device->CreateAdditionalSwapChain(presentation_params, &_screen->_swap_chain); hr = _d3d_device->CreateAdditionalSwapChain(presentation_params, &_screen->_swap_chain);
} }
@ -3002,12 +3006,13 @@ check_cooperative_level() {
return true; return true;
} }
switch(hr) { switch (hr) {
case D3DERR_DEVICENOTRESET: case D3DERR_DEVICENOTRESET:
_dx_is_ready = false; _dx_is_ready = false;
hr = reset_d3d_device(&_screen->_presentation_params); hr = reset_d3d_device(&_screen->_presentation_params);
if (FAILED(hr)) { if (FAILED(hr)) {
// I think this shouldnt fail unless I've screwed up the _presentation_params from the original working ones somehow // I think this shouldnt fail unless I've screwed up the
// _presentation_params from the original working ones somehow
dxgsg8_cat.error() dxgsg8_cat.error()
<< "check_cooperative_level Reset() failed, hr = " << D3DERRORSTRING(hr); << "check_cooperative_level Reset() failed, hr = " << D3DERRORSTRING(hr);
} }

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

@ -1115,23 +1115,23 @@ search_for_device(wdxGraphicsPipe8 *dxpipe, DXDeviceInfo *device_info) {
bool wdxGraphicsWindow8:: bool wdxGraphicsWindow8::
reset_device_resize_window(UINT new_xsize, UINT new_ysize) { reset_device_resize_window(UINT new_xsize, UINT new_ysize) {
assert((new_xsize > 0) && (new_ysize > 0)); assert((new_xsize > 0) && (new_ysize > 0));
bool bRetval = true; bool retval = true;
DXScreenData *pScrn; DXScreenData *screen = NULL;
D3DPRESENT_PARAMETERS d3dpp; D3DPRESENT_PARAMETERS d3dpp;
memcpy(&d3dpp, &_wcontext._presentation_params, sizeof(D3DPRESENT_PARAMETERS)); memcpy(&d3dpp, &_wcontext._presentation_params, sizeof(D3DPRESENT_PARAMETERS));
_wcontext._presentation_params.BackBufferWidth = new_xsize; _wcontext._presentation_params.BackBufferWidth = new_xsize;
_wcontext._presentation_params.BackBufferHeight = new_ysize; _wcontext._presentation_params.BackBufferHeight = new_ysize;
make_current(); make_current();
HRESULT hr = _dxgsg->reset_d3d_device(&_wcontext._presentation_params, &pScrn); HRESULT hr = _dxgsg->reset_d3d_device(&_wcontext._presentation_params, &screen);
if (FAILED(hr)) { if (FAILED(hr)) {
bRetval = false; retval = false;
wdxdisplay8_cat.error() wdxdisplay8_cat.error()
<< "reset_device_resize_window Reset() failed" << D3DERRORSTRING(hr); << "reset_device_resize_window Reset() failed" << D3DERRORSTRING(hr);
if (hr == D3DERR_OUTOFVIDEOMEMORY) { if (hr == D3DERR_OUTOFVIDEOMEMORY) {
memcpy(&_wcontext._presentation_params, &d3dpp, sizeof(D3DPRESENT_PARAMETERS)); memcpy(&_wcontext._presentation_params, &d3dpp, sizeof(D3DPRESENT_PARAMETERS));
hr = _dxgsg->reset_d3d_device(&_wcontext._presentation_params, &pScrn); hr = _dxgsg->reset_d3d_device(&_wcontext._presentation_params, &screen);
if (FAILED(hr)) { if (FAILED(hr)) {
wdxdisplay8_cat.error() wdxdisplay8_cat.error()
<< "reset_device_resize_window Reset() failed OutOfVidmem, then failed again doing Reset w/original params:" << D3DERRORSTRING(hr); << "reset_device_resize_window Reset() failed OutOfVidmem, then failed again doing Reset w/original params:" << D3DERRORSTRING(hr);
@ -1153,11 +1153,13 @@ reset_device_resize_window(UINT new_xsize, UINT new_ysize) {
} }
} }
// before you init_resized_window you need to copy certain changes to _wcontext // before you init_resized_window you need to copy certain changes to _wcontext
if (pScrn) if (screen) {
_wcontext._swap_chain = pScrn->_swap_chain; _wcontext._swap_chain = screen->_swap_chain;
}
wdxdisplay8_cat.debug() << "swapchain is " << _wcontext._swap_chain << "\n"; wdxdisplay8_cat.debug() << "swapchain is " << _wcontext._swap_chain << "\n";
_gsg->mark_new();
init_resized_window(); init_resized_window();
return bRetval; return retval;
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////