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

dont fill textures w/o ram images

Browse Source
This commit is contained in:
cxgeorge 2002-10-23 02:48:50 +00:00
parent c56d92f5d5
commit d0197351ab
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/dxgsg8/dxTextureContext8.cxx
View File

@ -1425,9 +1425,11 @@ IDirect3DTexture8 *DXTextureContext::CreateTexture(DXScreenData &scrn) {
#endif #endif
#endif #endif
hr = FillDDSurfTexturePixels(); if(_texture->has_ram_image()) {
if(FAILED(hr)) { hr = FillDDSurfTexturePixels();
goto error_exit; if(FAILED(hr)) {
goto error_exit;
}
} }
// Return the newly created texture // Return the newly created texture
@ -1443,6 +1445,12 @@ HRESULT DXTextureContext::
FillDDSurfTexturePixels(void) { FillDDSurfTexturePixels(void) {
HRESULT hr=E_FAIL; HRESULT hr=E_FAIL;
assert(IS_VALID_PTR(_texture)); assert(IS_VALID_PTR(_texture));
if(!_texture->has_ram_image()) {
dxgsg_cat.warning() << "CreateTexture: tried to fill surface that has no ram image!\n";
return S_OK;
}
PixelBuffer *pbuf = _texture->get_ram_image(); PixelBuffer *pbuf = _texture->get_ram_image();
if (pbuf == (PixelBuffer *)NULL) { if (pbuf == (PixelBuffer *)NULL) {
dxgsg_cat.fatal() << "CreateTexture: get_ram_image() failed\n"; dxgsg_cat.fatal() << "CreateTexture: get_ram_image() failed\n";