瀏覽代碼

*** empty log message ***

cxgeorge 23 年之前
父節點
當前提交
3ed52cad07
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      panda/src/dxgsg8/dxgsg8base.h

+ 2 - 2
panda/src/dxgsg8/dxgsg8base.h

@@ -75,10 +75,10 @@ typedef DWORD DXShaderHandle;
     var.dwSize = sizeof(type);
     var.dwSize = sizeof(type);
     
     
 #define SAFE_DELSHADER(TYPE,HANDLE,PDEVICE)  \
 #define SAFE_DELSHADER(TYPE,HANDLE,PDEVICE)  \
-  if(HANDLE!=NULL) {  PDEVICE->Delete##TYPE##Shader(HANDLE);  HANDLE=NULL;  }
+  if((HANDLE!=NULL)&&IS_VALID_PTR(PDEVICE)) { PDEVICE->Delete##TYPE##Shader(HANDLE);  HANDLE=NULL; }
 
 
 #define SAFE_DELETE(p)       { if(p) { assert(IS_VALID_PTR(p));   delete (p);     (p)=NULL; } }
 #define SAFE_DELETE(p)       { if(p) { assert(IS_VALID_PTR(p));   delete (p);     (p)=NULL; } }
-#define SAFE_DELETE_ARRAY(p) { if(p) { assert(IS_VALID_PTR(p));   delete[] (p);   (p)=NULL; } }
+#define SAFE_DELETE_ARRAY(p) { if(p) { assert(IS_VALID_PTR(p));   delete [] (p);   (p)=NULL; } }
 
 
 // for stuff outside a panda class
 // for stuff outside a panda class
 #define SAFE_RELEASE(p)      { if(p) { assert(IS_VALID_PTR(p)); (p)->Release(); (p)=NULL; } }
 #define SAFE_RELEASE(p)      { if(p) { assert(IS_VALID_PTR(p)); (p)->Release(); (p)=NULL; } }