Merge lp:~nick-dedekind/nux/lp1066788.cached-texture-pointers into lp:nux

[Nick Dedekind]

Added pointer checks for invalid cached textures (LP: #1066788)

Added pointer checks for invalid cached textures (LP: #1066788)

[lp:~nick-dedekind/nux/lp1066788.cached-texture-pointers]

692. By Nick Dedekind on 2012-10-25

updated GpuInfo const functions.

[Brandon Schaefer (brandontschaefer)]

Looks good.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[Didier Roche-Tolomelli (didrocks)]

This one seems easy to replicate and add a test for not triggering the crash anymore, isn't it?

=== modified file 'NuxGraphics/GLTextureResourceManager.cpp'
--- NuxGraphics/GLTextureResourceManager.cpp	2012-09-26 06:44:12 +0000
+++ NuxGraphics/GLTextureResourceManager.cpp	2012-10-25 07:16:22 +0000
@@ -383,6 +383,8 @@
 
   bool CachedBaseTexture::RecreateTexture(BaseTexture* Source)
   {
+    if (!m_Texture)
+      return false;
     int CurrentWidth   = m_Texture->GetWidth();
     int CurrentHeight  = m_Texture->GetHeight();
     int CurrentDepth   = m_Texture->GetDepth();
@@ -463,6 +465,8 @@
   {
     SURFACE_LOCKED_RECT LockedRect;
     ObjectPtr < IOpenGLTexture2D > Texture2D = m_Texture; //m_Texture.CastRef<IOpenGLTexture2D>();
+    if (!Texture2D)
+      return;
 
     OGL_CALL(Texture2D->LockRect(MipLevel, &LockedRect, NULL));
     SourceTexture->GetData(LockedRect.pBits, MipLevel, LockedRect.Pitch);
@@ -600,6 +604,8 @@
   {
     SURFACE_LOCKED_RECT            LockedRect;
     ObjectPtr <IOpenGLRectangleTexture>  TextureRectangle = m_Texture; //m_Texture.CastRef<IOpenGLRectangleTexture>();
+    if (!TextureRectangle)
+      return;
 
     OGL_CALL(TextureRectangle->LockRect( MipLevel, &LockedRect, NULL));
     SourceTexture->GetData( LockedRect.pBits, MipLevel, LockedRect.Pitch );
@@ -735,6 +741,8 @@
   {
     SURFACE_LOCKED_RECT    LockedRect;
     ObjectPtr <IOpenGLCubeTexture> CubemapTexture = m_Texture; //m_Texture.CastRef<IOpenGLCubeTexture>();
+    if (!CubemapTexture)
+      return;
 
     for (int face = CUBEMAP_FACE_POSITIVE_X; face < GL_TEXTURE_CUBE_MAP_NEGATIVE_Z + 1; face++)
     {
@@ -898,6 +906,8 @@
   {
     VOLUME_LOCKED_BOX       LockedBox;
     ObjectPtr <IOpenGLVolumeTexture> VolumeTexture = m_Texture; //m_Texture.CastRef<IOpenGLVolumeTexture>();
+    if (!VolumeTexture)
+      return;
     //TextureVolume*     Source          = UpCastResource<TextureVolume, BaseTexture>(SourceTexture);
 
     //for(int slice = 0; slice < ImageSurface::GetLevelDim(Source->GetFormat(), Source->GetDepth(), MipLevel); slice++)
@@ -1056,6 +1066,8 @@
   {
     SURFACE_LOCKED_RECT       LockedRect;
     ObjectPtr <IOpenGLAnimatedTexture> AnimatedTexture = m_Texture; //m_Texture.CastRef<IOpenGLAnimatedTexture>();
+    if (!AnimatedTexture)
+      return;
     TextureFrameAnimation*    Source          = UpCastResource<TextureFrameAnimation, BaseTexture> (SourceTexture);
 
     for (int frame = 0; frame < Source->GetDepth(); frame++)

=== modified file 'NuxGraphics/GpuDevice.h'
--- NuxGraphics/GpuDevice.h	2012-10-10 22:46:50 +0000
+++ NuxGraphics/GpuDevice.h	2012-10-25 07:16:22 +0000
@@ -113,8 +113,8 @@
     bool Support_ARB_Framebuffer_sRGB()          const    {return _support_arb_framebuffer_srgb;}
 #endif
 
-    int GetMaxFboAttachment() {return _opengl_max_fb_attachment;}
-    int GetMaxTextureSize() {return _opengl_max_texture_size;}
+    int GetMaxFboAttachment()                    const    {return _opengl_max_fb_attachment;}
+    int GetMaxTextureSize()                      const    {return _opengl_max_texture_size;}
 
 
   private: