Fix rendering to a destroyed gralloc buffer.

src/OpenGL/common/Image.hpp

@@ -183,12 +183,13 @@ public:
 private:
 	ANativeWindowBuffer *nativeBuffer;
 
-	virtual ~AndroidNativeImage() { }
-
-	void setNativeBuffer(ANativeWindowBuffer* buffer)
+	virtual ~AndroidNativeImage()
 	{
-		nativeBuffer = buffer;
-		nativeBuffer->common.incRef(&nativeBuffer->common);
+		// Wait for any draw calls that use this image to finish
+		resource->lock(sw::DESTRUCT);
+		resource->unlock();
+
+		nativeBuffer->common.decRef(&nativeBuffer->common);
 	}
 
 	virtual void *lockInternal(int x, int y, int z, sw::Lock lock, sw::Accessor client)
@@ -255,15 +256,6 @@ private:
 	{
 		GrallocModule::getInstance()->unlock(nativeBuffer->handle);
 	}
-
-	virtual void destroyShared()   // Release a shared image
-	{
-		if(nativeBuffer)
-		{
-			nativeBuffer->common.decRef(&nativeBuffer->common);
-		}
-		egl::Image::destroyShared();
-	}
 };
 
 #endif  // __ANDROID__

src/Renderer/Surface.hpp

@@ -244,6 +244,9 @@ namespace sw
 
 		static void setTexturePalette(unsigned int *palette);
 
+	protected:
+		sw::Resource *resource;
+
 	private:
 		typedef unsigned char byte;
 		typedef unsigned short word;
@@ -365,7 +368,6 @@ namespace sw
 		static unsigned int *palette;   // FIXME: Not multi-device safe
 		static unsigned int paletteID;
 
-		sw::Resource *resource;
 		bool hasParent;
 	};
 }