From: Felix Kuehling <fxkuehl@gmx.de>
Date: Wed, 2 Feb 2005 15:57:25 +0000 (+0000)
Subject: Check for heap == NULL before driSetTextureSwapCounterLocation.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eba5b610b9d0c782e669efafa7ee1b785ce3254d;p=mesa.git

Check for heap == NULL before driSetTextureSwapCounterLocation.
---

diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c
index 5592d0906a7..1ce8a4b88fd 100644
--- a/src/mesa/drivers/dri/savage/savage_xmesa.c
+++ b/src/mesa/drivers/dri/savage/savage_xmesa.c
@@ -379,8 +379,11 @@ savageCreateContext( const __GLcontextModes *mesaVis,
 	    &imesa->swapped,
 	    sizeof( savageTexObj ),
 	    (destroy_texture_object_t *) savageDestroyTexObj );
-       driSetTextureSwapCounterLocation( imesa->textureHeaps[i],
-					 & imesa->c_textureSwaps );
+       /* If textureSize[i] == 0 textureHeaps[i] is NULL. This can happen
+	* if there is not enough card memory for a card texture heap. */
+       if (imesa->textureHeaps[i])
+	   driSetTextureSwapCounterLocation( imesa->textureHeaps[i],
+					     & imesa->c_textureSwaps );
    }
    imesa->texture_depth = driQueryOptioni (&imesa->optionCache,
 					   "texture_depth");